improve login window

diff --git a/gtk/loginframe.c b/gtk/loginframe.c
index 5b9d7f5c44cb7b57a03d400d3f1252dc78c76fd8..538fab17427bfa097515fa35d5e6b5ef919b53ea 100644 (file)
--- a/gtk/loginframe.c
+++ b/gtk/loginframe.c
@@ -75,11 +75,22 @@ void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg){
                return;
        }
 
-       gtk_widget_hide(linphone_gtk_get_widget(mw,"logout"));
-       gtk_widget_hide(linphone_gtk_get_widget(mw,"idle_frame"));
+       {
+               const char *login_image=linphone_gtk_get_ui_config("login_image",NULL);
+               if (login_image){
+                       GdkPixbuf *pbuf=create_pixbuf (login_image);
+                       gtk_image_set_from_pixbuf (GTK_IMAGE(linphone_gtk_get_widget(mw,"login_image")),
+                                                  pbuf);
+                       g_object_unref(G_OBJECT(pbuf));
+               }
+       }
+
+       gtk_widget_hide(linphone_gtk_get_widget(mw,"disconnect_item"));
+       gtk_widget_hide(linphone_gtk_get_widget(mw,"main_frame"));
+       gtk_widget_hide(linphone_gtk_get_widget(mw,"keypad_frame"));
        gtk_widget_show(linphone_gtk_get_widget(mw,"login_frame"));
        gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"main_menu"),FALSE);
-       gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"modes"),FALSE);
+       gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"options_menu"),FALSE);
        str=g_strdup_printf(_("Please enter login information for %s"),linphone_proxy_config_get_domain(cfg));
        gtk_label_set_text(GTK_LABEL(label),str);
        g_object_set_data(G_OBJECT(mw),"login_proxy_config",cfg);
@@ -101,11 +112,11 @@ void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg){
 
 void linphone_gtk_exit_login_frame(void){
        GtkWidget *mw=linphone_gtk_get_main_window();
-       gtk_widget_show(linphone_gtk_get_widget(mw,"idle_frame"));
+       gtk_widget_show(linphone_gtk_get_widget(mw,"main_frame"));
        gtk_widget_hide(linphone_gtk_get_widget(mw,"login_frame"));
        gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"main_menu"),TRUE);
-       gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"modes"),TRUE);
-       gtk_widget_show(linphone_gtk_get_widget(mw,"logout"));
+       gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"options_menu"),TRUE);
+       gtk_widget_show(linphone_gtk_get_widget(mw,"disconnect_item"));
 }
 
 void linphone_gtk_logout_clicked(){

diff --git a/gtk/main.ui b/gtk/main.ui
index c4bcfa14d07a99bdd5f6e9b3e97b30ea81d07c5a..3de82a6729135f9fe8ca3a8222f37eb9a40b0ee1 100644 (file)
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -128,7 +128,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="menuitem3">
+              <object class="GtkMenuItem" id="options_menu">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Options</property>
                 <property name="use_underline">True</property>
@@ -1087,6 +1087,7 @@
             <child>
               <object class="GtkFrame" id="login_frame">
                 <property name="label_xalign">0</property>
+                <property name="shadow_type">etched-out</property>
                 <child>
                   <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
@@ -1095,10 +1096,20 @@
                       <object class="GtkVBox" id="vbox1">
                         <property name="visible">True</property>
                         <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkImage" id="login_image">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-missing-image</property>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="GtkFrame" id="frame5">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment3">
                                 <property name="visible">True</property>
@@ -1211,7 +1222,8 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="position">0</property>
+                            <property name="padding">10</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
@@ -1234,7 +1246,7 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="position">1</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </object>

diff --git a/mediastreamer2 b/mediastreamer2
index fd66bca4e57c1c8f81d69e51944186c980395ed2..292e7943c683fd8ada2dc0234fdcb1b9e299aba9 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit fd66bca4e57c1c8f81d69e51944186c980395ed2
+Subproject commit 292e7943c683fd8ada2dc0234fdcb1b9e299aba9