[maemo-commits] [maemo-commits] r15887 - projects/haf/branches/hildon-fm/fremantle/hildon-fm
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Aug 25 11:00:43 EEST 2008
- Previous message: [maemo-commits] r15886 - projects/haf/trunk/hildon-fm/tests
- Next message: [maemo-commits] r15888 - projects/haf/trunk/hildon-fm/tests
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: yangli
Date: 2008-08-25 11:00:40 +0300 (Mon, 25 Aug 2008)
New Revision: 15887
Modified:
projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c
projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-selection.c
projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-selection.h
projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-model.c
Log:
dialogs changes
Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c 2008-08-22 08:28:37 UTC (rev 15886)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c 2008-08-25 08:00:40 UTC (rev 15887)
@@ -52,7 +52,6 @@
#include <gtk/gtkimage.h>
#include <gtk/gtklabel.h>
#include <string.h>
-#include <hildon/hildon.h>
#include <hildon/hildon-caption.h>
#include <hildon/hildon-defines.h>
#include <hildon/hildon-banner.h>
@@ -62,6 +61,7 @@
#include <gdk/gdkx.h>
#include <stdlib.h>
#include <glib.h>
+#include <hildon/hildon.h>
#include "hildon-file-common-private.h"
@@ -78,13 +78,11 @@
#define FILE_SELECTION_HEIGHT (8 * 30 + 2 * HILDON_MARGIN_DEFAULT)
#define FILE_SELECTION_WIDTH_LIST 240 /* Width used in select folder
mode */
-#define FILE_SELECTION_UPBUTTON_WIDTH 40 /* the width of the up level button */
-#define FILE_SELECTION_ADDRESS_HEIGHT FILE_SELECTION_HEIGHT/9
+#define FILE_SELECTION_UPBUTTON_WIDTH 60 /* the width of the up level button */
+#define FILE_SELECTION_ADDRESS_HEIGHT FILE_SELECTION_HEIGHT/6
#define FILE_SELECTION_WIDTH_TOTAL 590 /* Width for full filetree (both
content and navigation pane) */
-#define FOLDER_CHANGE_DIALOG_WIDTH 400
-#define FOLDER_CHANGE_DIALOG_HEIGHT 600
#ifdef DEBUG
#define DBG(args...) fprintf (stderr, ## args)
@@ -114,7 +112,6 @@
void hildon_gtk_file_chooser_install_properties(GObjectClass * klass);
-static void hildon_file_chooser_dialog_update_path(GtkWidget *fs_widget, gpointer data);
static void hildon_file_chooser_update_path_button(HildonFileChooserDialog *self);
enum {
@@ -129,7 +126,6 @@
PROP_MAX_FULL_PATH_LENGTH,
PROP_SELECTION_MODE,
PROP_INVISIBLE_FILES,
- PROP_SHOW_NEW_BUTTON
};
struct _HildonFileChooserDialogPrivate {
@@ -177,7 +173,6 @@
gboolean should_show_location;
gboolean show_upnp;
gboolean invisible_files;
- gboolean should_show_new_button;
};
static void hildon_response_up_button_clicked(GtkWidget *widget,
@@ -375,7 +370,6 @@
static void file_activated_handler(GtkWidget * widget, gpointer user_data)
{
hildon_file_chooser_update_path_button(HILDON_FILE_CHOOSER_DIALOG(user_data));
- //gtk_dialog_response(GTK_DIALOG(user_data), GTK_RESPONSE_OK);
}
static void
@@ -1040,7 +1034,7 @@
* priv)
{
if (priv->should_show_folder_button
- && (priv->action == GTK_FILE_CHOOSER_ACTION_SAVE
+ && (priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER/*GTK_FILE_CHOOSER_ACTION_SAVE*/
|| priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER))
{
gtk_widget_show(priv->folder_button);
@@ -1053,6 +1047,21 @@
g_object_set (G_OBJECT (priv->eventbox_location),
"can-focus", FALSE, NULL);
}
+ switch (priv->action){
+ case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:
+ gtk_widget_hide(priv->action_button);
+ break;
+ case GTK_FILE_CHOOSER_ACTION_OPEN:
+ gtk_widget_hide(priv->action_button);
+ gtk_widget_hide(priv->action_button);
+ break;
+ /*currently, it has no changes to the UI
+ case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:
+
+ break;*/
+ default:
+ break;
+ }
}
static void update_location_visibility(HildonFileChooserDialogPrivate *
@@ -1108,7 +1117,7 @@
}
- hildon_caption_set_label (HILDON_CAPTION (priv->caption_control_location),
+ hildon_caption_set_label (HILDON_CAPTION (priv->caption_control_location),
_("sfil_fi_save_objects_location"));
gtk_widget_hide(GTK_WIDGET(priv->filetree));
@@ -1121,9 +1130,9 @@
gtk_button_set_label(GTK_BUTTON(priv->action_button),
_("ckdg_bd_save_object_dialog_ok"));
gtk_button_set_label(GTK_BUTTON(priv->folder_button),
- _("sfil_bd_save_object_dialog_change_folder"));
+ _("sfil_bd_save_object_dialog_change_folder"));
gtk_button_set_label(GTK_BUTTON(priv->cancel_button),
- _("ckdg_bd_save_object_dialog_cancel"));
+ _("ckdg_bd_save_object_dialog_cancel"));
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(self),
_("ckdg_va_save_object_name_stub_default"));
hildon_helper_set_insensitive_message (priv->action_button,
@@ -1132,27 +1141,22 @@
case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:
gtk_widget_hide(priv->caption_control_name);
gtk_widget_hide(priv->hbox_items);
- priv->should_show_new_button = TRUE;
- hildon_file_selection_set_show_button(priv->filetree,
- priv->should_show_new_button);
- gtk_widget_set_size_request(GTK_WIDGET(self),
- FOLDER_CHANGE_DIALOG_WIDTH,
- FOLDER_CHANGE_DIALOG_HEIGHT);
-
gtk_widget_set_size_request(GTK_WIDGET(priv->filetree),
FILE_SELECTION_WIDTH_LIST,
FILE_SELECTION_HEIGHT);
- /*gtk_widget_set_size_request(GTK_WIDGET(priv->up_button),
- FILE_SELECTION_UPBUTTON_WIDTH,
- FILE_SELECTION_ADDRESS_HEIGHT);
gtk_widget_set_size_request(GTK_WIDGET(priv->hbox_address),
FILE_SELECTION_WIDTH_LIST,
FILE_SELECTION_ADDRESS_HEIGHT);
+ gtk_widget_set_size_request(GTK_WIDGET(priv->up_button),
+ FILE_SELECTION_UPBUTTON_WIDTH,
+ FILE_SELECTION_ADDRESS_HEIGHT);
gtk_widget_set_size_request(GTK_WIDGET(priv->path_button),
- FILE_SELECTION_WIDTH_LIST - FILE_SELECTION_UPBUTTON_WIDTH,
- FILE_SELECTION_ADDRESS_HEIGHT);*/
+ FILE_SELECTION_WIDTH_LIST -
+ FILE_SELECTION_UPBUTTON_WIDTH -
+ HILDON_MARGIN_DEFAULT,
+ FILE_SELECTION_ADDRESS_HEIGHT);
gtk_widget_show(priv->hbox_address);
gtk_widget_show(GTK_WIDGET(priv->filetree));
@@ -1173,8 +1177,8 @@
case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER:
hildon_caption_set_label(HILDON_CAPTION(priv->caption_control_name),
_("ckdg_fi_new_folder_name"));
- hildon_caption_set_label (HILDON_CAPTION (priv->caption_control_location),
- _("ckdg_fi_new_folder_location"));
+ hildon_caption_set_label (HILDON_CAPTION (priv->caption_control_location),
+ _("ckdg_fi_new_folder_location"));
gtk_widget_show_all(priv->caption_control_name);
gtk_widget_hide(GTK_WIDGET(priv->filetree));
_hildon_file_selection_realize_help(priv->filetree);
@@ -1193,7 +1197,8 @@
default:
g_assert_not_reached();
};
-
+ /* according the spec of Fremantle File management,
+ this function is changed */
update_folder_button_visibility(priv);
update_location_visibility(priv);
}
@@ -1286,6 +1291,7 @@
priv->invisible_files);
hildon_file_selection_set_filter(priv->filetree, NULL);
sync_current_folders(self, HILDON_FILE_CHOOSER_DIALOG(dialog));
+
return dialog;
}
@@ -1356,6 +1362,7 @@
dialog = hildon_file_chooser_dialog_create_sub_dialog(self,
GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
+
while ((response = gtk_dialog_run(GTK_DIALOG(dialog))) == GTK_RESPONSE_OK)
{
uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
@@ -1535,7 +1542,6 @@
}
g_free(entry_text);
}
- printf("yang : here is ok\n");
break;
case HILDON_RESPONSE_FOLDER_BUTTON:
g_signal_stop_emission_by_name(widget, "response");
@@ -1677,9 +1683,6 @@
case PROP_INVISIBLE_FILES:
priv->invisible_files = g_value_get_boolean(value);
break;
- case PROP_SHOW_NEW_BUTTON:
- priv->should_show_new_button = g_value_get_boolean(value);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -1749,9 +1752,6 @@
case PROP_INVISIBLE_FILES:
g_value_set_boolean(value, priv->invisible_files);
break;
- case PROP_SHOW_NEW_BUTTON:
- g_value_set_boolean(value, priv->should_show_new_button);
- break;
default: /* Backend is not readable */
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -1874,7 +1874,6 @@
GTK_WIDGET_CLASS(klass)->show_all = gtk_widget_show;
GTK_OBJECT_CLASS(klass)->destroy = hildon_file_chooser_dialog_destroy;
-
pspec = g_param_spec_string("empty-text", "Empty text",
"String to use when selected "
"folder is empty",
@@ -1924,11 +1923,6 @@
FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
g_object_class_install_property(gobject_class, PROP_INVISIBLE_FILES, pspec);
- pspec = g_param_spec_boolean("should-show-new-button", "should show new button",
- "new button should be shown (if it's true)",
- FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
- g_object_class_install_property(gobject_class, PROP_SHOW_NEW_BUTTON, pspec);
-
g_object_class_install_property(gobject_class, PROP_MULTIPLE_TEXT,
g_param_spec_string("save-multiple", "Save multiple files",
"Text to be displayed in items field when saving multiple files",
@@ -1957,6 +1951,7 @@
G_PARAM_READWRITE);
g_object_class_install_property(gobject_class, PROP_SELECTION_MODE, pspec);
+
hildon_gtk_file_chooser_install_properties(gobject_class);
}
@@ -2056,13 +2051,17 @@
HildonFileChooserDialogPrivate *priv = HILDON_FILE_CHOOSER_DIALOG(self)->priv;
GtkTreeIter iter;
GtkTreeIter cur_iter;
+ char *path;
+ char *cur_path;
gchar *gtk_tree_path_str;
gchar *title;
gchar *path_string;
GList *list = NULL;
-
- if (hildon_file_selection_get_current_folder_iter(priv->filetree, &iter)){
+ if((path = hildon_file_selection_get_current_folder_uri(priv->filetree)) != NULL){
+ hildon_file_system_model_load_uri(GTK_TREE_MODEL(priv->model),
+ path, &iter);
+ free(path);
gtk_tree_model_get(GTK_TREE_MODEL(priv->model), &iter,
HILDON_FILE_SYSTEM_MODEL_COLUMN_DISPLAY_NAME,
&title, -1);
@@ -2076,7 +2075,6 @@
else {
gtk_widget_set_sensitive(priv->up_button, TRUE);
}
- printf("yang: the path string is %s\n", gtk_tree_path_str);
free(gtk_tree_path_str);
while(g_strcasecmp(title, "/")/*!g_strcasecmp(gtk_tree_path_str, "0")*/){
//free(title);
@@ -2088,8 +2086,7 @@
gtk_tree_model_iter_parent(GTK_TREE_MODEL(priv->model), &iter, &cur_iter);
gtk_tree_model_get(GTK_TREE_MODEL(priv->model), &iter,
HILDON_FILE_SYSTEM_MODEL_COLUMN_DISPLAY_NAME,
- &title, -1);
-
+ &title, -1);
/*gtk_tree_path_str = gtk_tree_model_get_string_from_iter(GTK_TREE_MODEL(priv->model),
&iter);*/
}
@@ -2114,16 +2111,19 @@
{
GtkTreeIter iter;
GtkTreeIter cur_iter;
+ char *path = NULL;
+ GError **error;
g_return_if_fail(HILDON_IS_FILE_CHOOSER_DIALOG(data));
HildonFileChooserDialogPrivate *priv = HILDON_FILE_CHOOSER_DIALOG(data)->priv;
- if (hildon_file_selection_get_current_folder_iter(priv->filetree, &iter)){
+ if((path = hildon_file_selection_get_current_folder_uri(priv->filetree)) != NULL){
+ hildon_file_system_model_load_uri(GTK_TREE_MODEL(priv->model),
+ path, &iter);
cur_iter = iter;
gtk_tree_model_iter_parent(GTK_TREE_MODEL(priv->model), &iter, &cur_iter);
hildon_file_selection_set_current_folder_iter(priv->filetree, &iter);
+ free(path);
}
- //hildon_file_chooser_update_path_button(HILDON_FILE_CHOOSER_DIALOG(data));
- g_print ("up button is clicked\n");
}
static void hildon_response_path_button_clicked( GtkWidget *widget,
@@ -2132,12 +2132,10 @@
{
g_return_if_fail(HILDON_IS_FILE_CHOOSER_DIALOG(data));
g_signal_emit_by_name(data, "response", GTK_RESPONSE_OK, NULL);
-
- g_print ("path button is clicked\n");
}
-static void hildon_response_folder_button_clicked( GtkWidget *widget,
- gpointer data )
+static void hildon_response_folder_button_clicked(GtkWidget *widget,
+ gpointer data )
{
g_return_if_fail(HILDON_IS_FILE_CHOOSER_DIALOG(data));
g_signal_emit_by_name(data, "response", HILDON_RESPONSE_FOLDER_BUTTON, NULL);
@@ -2152,7 +2150,6 @@
HildonFileChooserDialogPrivate *priv;
GtkBox *box;
GtkWidget *eventbox, *label_items;
- GtkWidget *label_up, *label_down;
GtkSizeGroup *size_group;
GtkWidget *image = NULL;
@@ -2178,19 +2175,20 @@
G_CALLBACK (hildon_response_up_button_clicked), self);
gtk_widget_show(priv->up_button);
- priv->path_button = g_object_new(GTK_TYPE_BUTTON, "label", "Nokia Nxxx/", NULL);
+ priv->path_button = g_object_new(GTK_TYPE_BUTTON, "label", "Nokia Nxxx/",
+ "xalign", 0.0f, NULL);
g_signal_connect (G_OBJECT (priv->path_button), "clicked",
G_CALLBACK (hildon_response_path_button_clicked), self);
gtk_widget_show(priv->path_button);
- /*priv->action_button =
+ priv->action_button =
gtk_dialog_add_button(GTK_DIALOG(self),
_("ckdg_bd_select_object_ok_open"),
GTK_RESPONSE_OK);
priv->folder_button =
gtk_dialog_add_button(GTK_DIALOG(self),
_("ckdg_bd_change_folder_new_folder"),
- HILDON_RESPONSE_FOLDER_BUTTON);*/
+ HILDON_RESPONSE_FOLDER_BUTTON);
priv->cancel_button =
gtk_dialog_add_button(GTK_DIALOG(self),
_("ckdg_bd_select_object_cancel"),
@@ -2216,7 +2214,6 @@
priv->hbox_items = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
priv->image_location = gtk_image_new();
priv->title_location = gtk_label_new(NULL);
-
gtk_misc_set_alignment(GTK_MISC(priv->title_location), 0.0f, 0.5f);
gtk_box_pack_start(GTK_BOX(priv->hbox_location), priv->image_location,
FALSE, TRUE, 0);
@@ -2378,7 +2375,7 @@
gtk_dialog_set_has_separator(GTK_DIALOG(obj), FALSE);
hildon_file_chooser_dialog_set_limit(HILDON_FILE_CHOOSER_DIALOG(obj));
- //hildon_file_chooser_update_path_button(HILDON_FILE_CHOOSER_DIALOG(obj));
+
return obj;
}
@@ -2804,37 +2801,3 @@
g_object_get (priv->filetree, "show-upnp", &show_upnp, NULL);
return show_upnp;
}
-
-static void hildon_file_chooser_dialog_update_path(GtkWidget *fs_widget, gpointer data)
-{
- GtkFilePath *path = NULL;
- gboolean showthumbnails = FALSE;
- HildonFileSystemModel *fsmodel = NULL;
- GtkTreeIter iter; // = NULL;
-
- gchar *title = NULL;
-
- if (fs_widget == NULL) {
- return;
- }
-
- path = hildon_file_selection_get_current_folder((HildonFileSelection *) fs_widget);
- if (path == NULL) {
- return;
- }
-
- if (hildon_file_selection_get_current_folder_iter((HildonFileSelection *) fs_widget,
- &iter)) {
- g_object_get(G_OBJECT(fs_widget), "model", &fsmodel, NULL);
- if (fsmodel == NULL) {
- gtk_file_path_free(path);
- return;
- }
- gtk_tree_model_get((GtkTreeModel *) fsmodel, &iter,
- HILDON_FILE_SYSTEM_MODEL_COLUMN_DISPLAY_NAME, &title, -1);
- }
- printf("yang: title is %s", title);
- exit(0);
- g_free(title);
- gtk_file_path_free(path);
-}
Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-selection.c 2008-08-22 08:28:37 UTC (rev 15886)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-selection.c 2008-08-25 08:00:40 UTC (rev 15887)
@@ -44,13 +44,13 @@
#include <string.h>
#include <stdlib.h>
#include <libintl.h>
-
+#include <hildon/hildon.h>
#include <dbus/dbus.h>
#include "hildon-file-selection.h"
#include <hildon/hildon-banner.h>
#include <hildon/hildon-defines.h>
-#include <hildon/hildon.h>
+
#include "hildon-file-common-private.h"
/* I wonder where does that additional +2 come from.
@@ -127,7 +127,7 @@
PROP_ACTIVE_PANE,
PROP_SHOW_UPNP,
PROP_PANE_POSITION,
- PROP_DRAGGING,
+ PROP_DRAGGING
};
struct _HildonFileSelectionPrivate {
@@ -136,14 +136,9 @@
GtkWidget *scroll_thumb;
GtkWidget *dir_tree;
GtkWidget *view[4]; /* List, thumbnail, empty, repair */
- /* the pointer to the file_chooser_dialog to
- notify to change the text in the path button */
int cur_view;
GtkWidget *hpaned;
- /* vertical box to contain a dummy label and the button new */
- GtkWidget *vbox_button;
- /* button new used in the libhildonfm only */
- GtkWidget *new_button;
+
GtkTreeModel *main_model;
GtkTreeModel *sort_model; /* HildonFileSystemModel doesn't implement */
GtkTreeModel *dir_sort; /* GtkTreeSortable */
@@ -200,9 +195,6 @@
/* set this flag to true, files will be filtered out, used
in for example, folder chooser dialog and some other similar dialogs */
gboolean invisible_files;
- /* TRUE: show the button new
- FALSE: hide the button new */
- gboolean should_show_new_button;
};
#if 0
@@ -1729,6 +1721,7 @@
g_error_free(error);
}
#endif
+
gtk_tree_path_free(sort_path);
}
}
@@ -1749,18 +1742,23 @@
=> wrong row might be activated */
while (gtk_events_pending())
gtk_main_iteration();
+
model = gtk_tree_view_get_model(view); /* Content pane filter model */
+
if (gtk_tree_model_get_iter(model, &iter, path)) {
gtk_tree_model_get(model, &iter,
HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_FOLDER,
&is_folder,
HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_AVAILABLE,
- &is_available, -1);
+ &is_available, -1);
+
if (is_available) {
if (is_folder) {
filter_path = gtk_tree_model_sort_convert_path_to_child_path(
GTK_TREE_MODEL_SORT(model), path);
+
+
base_path = gtk_tree_model_filter_convert_path_to_child_path(
GTK_TREE_MODEL_FILTER(
HILDON_FILE_SELECTION(data)->priv->view_filter),
@@ -1798,6 +1796,7 @@
HILDON_FILE_SYSTEM_MODEL(self->priv->main_model),
&iter, FALSE);
}
+
g_signal_emit(data, signal_file_activated, 0);
}
}
@@ -3065,7 +3064,7 @@
self->priv->view[2], TRUE, TRUE, 0);
{
- GtkWidget *vbox, *label, *button_label, *button, *button_box, vbox_button;
+ GtkWidget *vbox, *label, *button_label, *button, *button_box;
label = gtk_label_new (_("hfil_li_memory_card_corrupted"));
#if 0
@@ -3097,19 +3096,7 @@
self->priv->view[3] = vbox;
gtk_box_pack_start (GTK_BOX (self->priv->view_selector),
- self->priv->view[3], TRUE, TRUE, 0);
-
- self->priv->vbox_button = gtk_vbox_new (FALSE, 0);
- self->priv->new_button = gtk_button_new_with_label("new");
- button_label = gtk_label_new (" ");
- gtk_box_pack_start(GTK_BOX(self->priv->vbox_button), button_label,
- TRUE, FALSE, 10);
- gtk_box_pack_end(GTK_BOX(self->priv->vbox_button), self->priv->new_button,
- FALSE, FALSE, 0);
- gtk_box_pack_end(GTK_BOX (self->priv->view_selector),
- self->priv->vbox_button, FALSE, TRUE, 0);
- gtk_widget_show(self->priv->new_button);
-
+ self->priv->view[3], TRUE, TRUE, 0);
}
self->priv->hpaned = gtk_hpaned_new();
@@ -3168,7 +3155,6 @@
hildon_file_selection_create_dir_view(self);
hildon_file_selection_create_list_view(self);
hildon_file_selection_create_thumbnail_view(self);
- printf("prepare to enter pannarea attached \n");
if(self->priv->pannable_flag){
printf("pannarea attached \n");
@@ -3183,9 +3169,9 @@
}
gtk_box_pack_start (GTK_BOX (self->priv->view_selector),
- self->priv->scroll_list, TRUE, TRUE, 0);
+ self->priv->scroll_list, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (self->priv->view_selector),
- self->priv->scroll_thumb, TRUE, TRUE, 0);
+ self->priv->scroll_thumb, TRUE, TRUE, 0);
/* Also the views of the navigation pane are trees (and this is
needed). Let's deny expanding */
@@ -3241,7 +3227,7 @@
(hildon_file_selection_check_close_load_banner),
self, 0);
g_signal_connect_object(priv->main_model, "device-disconnected",
- G_CALLBACK(hildon_file_selection_check_location), self, 0);
+ G_CALLBACK(hildon_file_selection_check_location), self, 0);
hildon_file_selection_set_select_multiple(self, FALSE);
@@ -3259,9 +3245,9 @@
gtk_widget_hide (priv->scroll_thumb);
gtk_widget_hide (priv->view[2]);
gtk_widget_hide (priv->view[3]);
- hildon_file_selection_set_show_button(self, FALSE);
hildon_file_selection_inspect_view (priv);
+
return obj;
}
@@ -4746,20 +4732,4 @@
priv->invisible_files = invisible;
}
-void hildon_file_selection_set_show_button(HildonFileSelection *self,
- gboolean show)
-{
- HildonFileSelectionPrivate *priv = self->priv;
- if(show) {
- priv->should_show_new_button = TRUE;
- gtk_widget_show(priv->vbox_button);
- }
- else {
- priv->should_show_new_button = FALSE;
- gtk_widget_hide(priv->vbox_button);
- }
-}
-
-
-
Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-selection.h
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-selection.h 2008-08-22 08:28:37 UTC (rev 15886)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-selection.h 2008-08-25 08:00:40 UTC (rev 15887)
@@ -30,7 +30,6 @@
#include <gtk/gtkcontainer.h>
#include <gtk/gtkfilefilter.h>
#include "hildon-file-system-model.h"
-//#include "hildon-file-chooser-dialog.h"
G_BEGIN_DECLS
#define HILDON_TYPE_FILE_SELECTION (hildon_file_selection_get_type())
@@ -173,10 +172,7 @@
GtkTreeIter * main_iter);
void hildon_file_selection_set_invisible_files(HildonFileSelection *self,
gboolean invisible);
-void hildon_file_selection_set_show_button(HildonFileSelection *self,
- gboolean show);
-
#ifndef HILDON_DISABLE_DEPRECATED
gboolean hildon_file_selection_get_active_content_iter(HildonFileSelection
*self, GtkTreeIter *iter);
@@ -216,7 +212,6 @@
HildonFileSelectionPane hildon_file_selection_get_active_pane(HildonFileSelection *self);
void hildon_file_selection_hide_navigation_pane(HildonFileSelection * self);
-
void hildon_file_selection_hide_content_pane(HildonFileSelection * self);
void hildon_file_selection_show_content_pane(HildonFileSelection * self);
@@ -232,10 +227,5 @@
void hildon_file_selection_move_cursor_to_uri (HildonFileSelection *self,
const gchar *uri);
-void get_current_tree_path(HildonFileSelection *self, char* uri);
-
-/*void hildon_file_selection_associate_file_chooser_dialog(HildonFileSelection *self,
- HildonFileChooserDialog *chooser_dialog);
-*/
G_END_DECLS
#endif
Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-model.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-model.c 2008-08-22 08:28:37 UTC (rev 15886)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-model.c 2008-08-25 08:00:40 UTC (rev 15887)
@@ -1474,7 +1474,7 @@
GNode *node;
g_object_unref (handle);
- printf("yang hello here\n");
+
/* When the operation has been cancelled, handle_data->node is no
longer valid.
*/
@@ -1542,6 +1542,7 @@
/* The following has to be done last since it might do anything to
model_node, including loading it again.
*/
+
if (gtk_file_folder_is_finished_loading (folder))
{
GSList *children = NULL;
@@ -1564,9 +1565,7 @@
if (model_node->location
&& HILDON_IS_FILE_SYSTEM_ROOT (model_node->location))
model->priv->first_root_scan_completed = TRUE;
- printf("yang : step completed");
-
hildon_file_system_model_folder_finished_loading
(model_node->folder, model);
gtk_file_paths_free (children);
@@ -1590,6 +1589,7 @@
g_assert(node != NULL && path != NULL);
model_node = node->data;
g_assert(model_node != NULL);
+
/* Folder already exists or we have already asked for it.
*/
if (model_node->folder || model_node->get_folder_handle)
@@ -2837,11 +2837,12 @@
g_return_val_if_fail(iter != NULL, FALSE);
DBG ("LOAD %s\n", (char *)path);
+
/* Block until the first scanning of the root folder is complete
so that we know about all memory cards, usb mass storage
devices, etc.
*/
- while (!priv->first_root_scan_completed)
+ while (!priv->first_root_scan_completed)
{
DBG ("+");
gtk_main_iteration();
- Previous message: [maemo-commits] r15886 - projects/haf/trunk/hildon-fm/tests
- Next message: [maemo-commits] r15888 - projects/haf/trunk/hildon-fm/tests
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]