[Title] add button type on create/modify window of vtm

[Type]    Enhancement
[Module]    // Module Name - (Main / Sub)
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/tizen/src/.gitignore b/tizen/src/.gitignore
index 68cfc92..6ed9da2 100644 (file)
--- a/tizen/src/.gitignore
+++ b/tizen/src/.gitignore
@@ -1,5 +1,7 @@
-simulator-arm
-simulator-x86
+emulator-arm
+emulator-x86
+vtm
 about_version.c
+Emulator/
 .*.d
 *~

diff --git a/tizen/src/vtm.c b/tizen/src/vtm.c
index b77eaf9..9700490 100644 (file)
--- a/tizen/src/vtm.c
+++ b/tizen/src/vtm.c
@@ -771,6 +771,7 @@ int write_config_file(gchar *filepath)
        set_config_value(filepath, HARDWARE_GROUP, SDCARD_PATH_KEY, virtual_target_info.sdcard_path);
     set_config_type(filepath, HARDWARE_GROUP, RAM_SIZE_KEY, virtual_target_info.ram_size);
     set_config_value(filepath, HARDWARE_GROUP, DPI_KEY, virtual_target_info.dpi);
+    set_config_type(filepath, HARDWARE_GROUP, BUTTON_TYPE_KEY, virtual_target_info.button_type);
        set_config_value(filepath, HARDWARE_GROUP, DISK_PATH_KEY, virtual_target_info.diskimg_path);
 
        return 0;
@@ -878,6 +879,21 @@ void resolution_select_cb(GtkWidget *widget, gpointer data)
        }
 }
 
+void buttontype_select_cb(void)
+{
+       gboolean active = FALSE;
+       
+       GtkWidget *create_radiobutton = (GtkWidget *)gtk_builder_get_object(g_create_builder, "radiobutton10");
+       active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(create_radiobutton));
+       if(active == TRUE)
+               virtual_target_info.button_type = 1;
+       else
+               virtual_target_info.button_type = 3;
+
+       INFO( "button_type : %d\n", virtual_target_info.button_type);
+}
+
+
 void sdcard_size_select_cb(void)
 {
        char *size;
@@ -976,6 +992,7 @@ void modify_ok_clicked_cb(GtkWidget *widget, gpointer data)
        char *info_file = g_strdup_printf("%sconfig.ini", virtual_target_path);
        
        ram_select_cb();
+       buttontype_select_cb();
     set_config_type(info_file, HARDWARE_GROUP, RAM_SIZE_KEY, virtual_target_info.ram_size);
        
 //     name character validation check
@@ -1313,6 +1330,7 @@ void ok_clicked_cb(void)
 
 void setup_create_frame(void)
 {
+       setup_buttontype_frame();
        setup_resolution_frame();
        setup_sdcard_frame();
        setup_ram_frame();
@@ -1450,6 +1468,17 @@ void setup_modify_button(char* target_name)
        g_signal_connect(cancel_button, "clicked", G_CALLBACK(create_window_deleted_cb), NULL);
 }
 
+void setup_buttontype_frame(void)
+{
+       GtkWidget *radiobutton10 = (GtkWidget *)gtk_builder_get_object(g_create_builder, "radiobutton10");
+       GtkWidget *radiobutton11 = (GtkWidget *)gtk_builder_get_object(g_create_builder, "radiobutton11");
+
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton10), TRUE);
+
+       g_signal_connect(GTK_RADIO_BUTTON(radiobutton10), "toggled", G_CALLBACK(buttontype_select_cb), NULL);
+       g_signal_connect(GTK_RADIO_BUTTON(radiobutton11), "toggled", G_CALLBACK(buttontype_select_cb), NULL);
+
+}
 
 void setup_resolution_frame(void)
 {

diff --git a/tizen/src/vtm.glade b/tizen/src/vtm.glade
index 02c4f8d..d2b975c 100644 (file)
--- a/tizen/src/vtm.glade
+++ b/tizen/src/vtm.glade
@@ -274,6 +274,73 @@
           </packing>
         </child>
         <child>
+          <object class="GtkFrame" id="frame5">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <child>
+              <object class="GtkAlignment" id="alignment4">
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkHBox" id="hbox9">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobutton10">
+                        <property name="label" translatable="yes">1 button</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">3</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobutton11">
+                        <property name="label" translatable="yes">3 buttons</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radiobutton10</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">3</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;b&gt;Button type&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
             <property name="label_xalign">0</property>
@@ -283,7 +350,7 @@
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkHBox" id="hbox3">
-                    <property name="height_request">40</property>
+                    <property name="height_request">30</property>
                     <property name="visible">True</property>
                     <child>
                       <object class="GtkRadioButton" id="radiobutton1">
@@ -360,7 +427,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="padding">2</property>
-            <property name="position">2</property>
+            <property name="position">3</property>
           </packing>
         </child>
         <child>
@@ -481,7 +548,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="padding">2</property>
-            <property name="position">3</property>
+            <property name="position">4</property>
           </packing>
         </child>
         <child>
@@ -536,7 +603,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="padding">2</property>
-            <property name="position">4</property>
+            <property name="position">5</property>
           </packing>
         </child>
         <child>
@@ -545,7 +612,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">5</property>
+            <property name="position">6</property>
           </packing>
         </child>
         <child>
@@ -584,7 +651,7 @@
           </object>
           <packing>
             <property name="padding">4</property>
-            <property name="position">6</property>
+            <property name="position">7</property>
           </packing>
         </child>
       </object>

diff --git a/tizen/src/vtm.h b/tizen/src/vtm.h
index d3a04a7..39af39e 100644 (file)
--- a/tizen/src/vtm.h
+++ b/tizen/src/vtm.h
@@ -66,6 +66,7 @@ void exit_vtm(void);
 void create_window_deleted_cb(void);
 
 void resolution_select_cb(GtkWidget *widget, gpointer data);
+void buttontype_select_cb(void);
 void sdcard_size_select_cb(void);
 void set_sdcard_create_active_cb(void);
 void set_sdcard_select_active_cb(void);
@@ -77,6 +78,7 @@ void ok_clicked_cb(void);
 void setup_create_frame(void);
 void setup_create_button(void);
 void setup_resolution_frame(void);
+void setup_buttontype_frame(void);
 void setup_sdcard_frame(void);
 void setup_ram_frame(void);