From ed026dba61070b95129da00138c1befa25332d40 Mon Sep 17 00:00:00 2001 From: "munkyu.im" Date: Fri, 2 Dec 2011 15:19:56 +0900 Subject: [PATCH] [Title] remove button type info and change to left alignment [Type] Enhancement [Module] [Priority] [CQ#] [Redmine#] #3579 [Problem] [Cause] [Solution] [TestCase] --- tizen/src/menu_callback.c | 10 ++++------ tizen/src/vtm.c | 29 ++++++----------------------- tizen/src/vtm.glade | 3 +++ 3 files changed, 13 insertions(+), 29 deletions(-) diff --git a/tizen/src/menu_callback.c b/tizen/src/menu_callback.c index ddd654a..0e475fb 100644 --- a/tizen/src/menu_callback.c +++ b/tizen/src/menu_callback.c @@ -580,7 +580,6 @@ void show_info_window(GtkWidget *widget, gpointer data) char *virtual_target_path; char *info_file; int info_file_status; - int button_type; char *resolution = NULL; char *sdcard_type = NULL; char *sdcard_path = NULL; @@ -604,7 +603,6 @@ void show_info_window(GtkWidget *widget, gpointer data) ERR( "target info file not exists : %s\n", target_name); return; } - button_type= get_config_type(info_file, HARDWARE_GROUP, BUTTON_TYPE_KEY); resolution= get_config_value(info_file, HARDWARE_GROUP, RESOLUTION_KEY); sdcard_type= get_config_value(info_file, HARDWARE_GROUP, SDCARD_TYPE_KEY); sdcard_path= get_config_value(info_file, HARDWARE_GROUP, SDCARD_PATH_KEY); @@ -643,13 +641,13 @@ void show_info_window(GtkWidget *widget, gpointer data) ram_size_detail = g_strdup_printf("%sMB", ram_size); disk_path_detail = g_strdup_printf("%s/%s", get_bin_path(), disk_path); #ifndef _WIN32 - details = g_strdup_printf("Name: %s\nCPU: %s\nResolution: %s\nButton type: %d button(s)\nRam size: %s\nDPI: %s\nSD card: %s\nSD path: %s\nDisk path: %s", - target_name, arch, resolution, button_type, ram_size_detail, dpi, sdcard_detail, sdcard_path_detail, disk_path_detail); + details = g_strdup_printf("Name: %s\nCPU: %s\nResolution: %s\nRam size: %s\nDPI: %s\nSD card: %s\nSD path: %s\nDisk path: %s", + target_name, arch, resolution, ram_size_detail, dpi, sdcard_detail, sdcard_path_detail, disk_path_detail); show_message("Emulator Details", details); #else /* _WIN32 */ gchar *details_win = NULL; - details = g_strdup_printf("Name: %s\nCPU: %s\nResolution: %s\nButton type: %d button(s)\nRam size: %s\nDPI: %s\nSD card: %s\nSD path: %s\nDisk path: %s", - target_name, arch, resolution, button_type, ram_size_detail, dpi, sdcard_detail, sdcard_path_detail, disk_path_detail); + details = g_strdup_printf("Name: %s\nCPU: %s\nResolution: %s\nRam size: %s\nDPI: %s\nSD card: %s\nSD path: %s\nDisk path: %s", + target_name, arch, resolution, ram_size_detail, dpi, sdcard_detail, sdcard_path_detail, disk_path_detail); details_win = change_path_from_slash(details); show_message("Emulator Details", details_win); free(details_win); diff --git a/tizen/src/vtm.c b/tizen/src/vtm.c index 547a216..dca6cff 100644 --- a/tizen/src/vtm.c +++ b/tizen/src/vtm.c @@ -378,7 +378,6 @@ void details_clicked_cb(GtkWidget *widget, gpointer selection) char *virtual_target_path; char *info_file; int info_file_status; - int button_type; char *resolution = NULL; char *sdcard_type = NULL; char *sdcard_path = NULL; @@ -414,7 +413,6 @@ void details_clicked_cb(GtkWidget *widget, gpointer selection) return; } //get info from config.ini - button_type= get_config_type(info_file, HARDWARE_GROUP, BUTTON_TYPE_KEY); resolution= get_config_value(info_file, HARDWARE_GROUP, RESOLUTION_KEY); sdcard_type= get_config_value(info_file, HARDWARE_GROUP, SDCARD_TYPE_KEY); sdcard_path= get_config_value(info_file, HARDWARE_GROUP, SDCARD_PATH_KEY); @@ -437,13 +435,13 @@ void details_clicked_cb(GtkWidget *widget, gpointer selection) ram_size_detail = g_strdup_printf("%sMB", ram_size); disk_path_detail = g_strdup_printf("%s/%s", get_bin_path(), disk_path); #ifndef _WIN32 - details = g_strdup_printf("Name: %s\nCPU: %s\nResolution: %s\nButton type: %d button(s)\nRam size: %s\nDPI: %s\nSD card: %s\nSD path: %s\nDisk path: %s", - target_name, arch, resolution, button_type, ram_size_detail, dpi, sdcard_detail, sdcard_path_detail, disk_path_detail); + details = g_strdup_printf("Name: %s\nCPU: %s\nResolution: %s\nRam size: %s\nDPI: %s\nSD card: %s\nSD path: %s\nDisk path: %s", + target_name, arch, resolution, ram_size_detail, dpi, sdcard_detail, sdcard_path_detail, disk_path_detail); show_message("Virtual Target Details", details); #else /* _WIN32 */ gchar *details_win = NULL; - details = g_strdup_printf("Name: %s\nCPU: %s\nResolution: %s\nButton type: %d button(s)\nRam size: %s\nDPI: %s\nSD card: %s\nSD path: %s\nDisk path: %s", - target_name, arch, resolution, button_type, ram_size_detail, dpi, sdcard_detail, sdcard_path_detail, disk_path_detail); + details = g_strdup_printf("Name: %s\nCPU: %s\nResolution: %s\nRam size: %s\nDPI: %s\nSD card: %s\nSD path: %s\nDisk path: %s", + target_name, arch, resolution, ram_size_detail, dpi, sdcard_detail, sdcard_path_detail, disk_path_detail); details_win = change_path_from_slash(details); show_message("Virtual Target Details", details_win); free(details_win); @@ -817,34 +815,19 @@ GtkWidget *setup_list(void) cell = gtk_cell_renderer_text_new(); //set text alignment -#if GTK_CHECK_VERSION(2,20,0) - gtk_cell_renderer_set_alignment(cell,0.5,0.5); -#endif column = gtk_tree_view_column_new_with_attributes("Target name", cell, "text", TARGET_NAME, NULL); -#if GTK_CHECK_VERSION(2,20,0) - gtk_tree_view_column_set_alignment(column,0.5); -#else gtk_tree_view_column_set_alignment(column,0.0); -#endif gtk_tree_view_column_set_min_width(column,130); gtk_tree_view_append_column(GTK_TREE_VIEW(list), column); column = gtk_tree_view_column_new_with_attributes("Ram size", cell, "text", RAM_SIZE, NULL); -#if GTK_CHECK_VERSION(2,20,0) - gtk_tree_view_column_set_alignment(column,0.5); -#else gtk_tree_view_column_set_alignment(column,0.0); -#endif - gtk_tree_view_column_set_min_width(column,50); + gtk_tree_view_column_set_min_width(column,100); gtk_tree_view_append_column(GTK_TREE_VIEW(list), column); column = gtk_tree_view_column_new_with_attributes("Resolution", cell, "text", RESOLUTION, NULL); -#if GTK_CHECK_VERSION(2,20,0) - gtk_tree_view_column_set_alignment(column,0.5); -#else gtk_tree_view_column_set_alignment(column,0.0); -#endif - gtk_tree_view_column_set_min_width(column,70); + gtk_tree_view_column_set_max_width(column,60); gtk_tree_view_append_column(GTK_TREE_VIEW(list), column); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sc_win), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER(sc_win), list); diff --git a/tizen/src/vtm.glade b/tizen/src/vtm.glade index a9e4ab4..e7cfcbc 100644 --- a/tizen/src/vtm.glade +++ b/tizen/src/vtm.glade @@ -81,6 +81,9 @@ 0.039999999105930328 1 Lists of currently available targets. + + + False -- 2.7.4