#include <hildon/hildon-banner.h>
#include <modest-platform.h>
#include <hildon/hildon-program.h>
+#include "modest-marshal.h"
#include <modest-maemo-utils.h>
#include <modest-defs.h>
#include <modest-ui-dimming-rules.h>
#include <modest-window-priv.h>
#include <modest-hildon2-window.h>
#include <modest-ui-actions.h>
+#include "modest-text-utils.h"
#include <hildon/hildon-edit-toolbar.h>
typedef struct _EditModeRegister {
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ModestHildon2WindowClass, edit_mode_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__INT,
- G_TYPE_NONE, 1, G_TYPE_INT);
+ modest_marshal_VOID__INT_BOOLEAN,
+ G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_BOOLEAN);
g_type_class_add_private (gobject_class, sizeof(ModestHildon2WindowPrivate));
{
g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW (window), FALSE);
- hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
+ hildon_banner_show_information (NULL, NULL, _CS("ckct_ib_cannot_zoom_here"));
return FALSE;
-
}
static void
g_return_if_fail (GTK_IS_BUTTON (button));
priv = MODEST_HILDON2_WINDOW_GET_PRIVATE (self);
+ modest_ui_dimming_manager_set_widget_dimming_mode (GTK_WIDGET (button),
+ MODEST_UI_DIMMING_MODE_HIDE);
+
if (dimming_callback)
modest_dimming_rules_group_add_widget_rule (priv->app_menu_dimming_group,
GTK_WIDGET (button),
(GCallback) dimming_callback,
MODEST_WINDOW (self));
hildon_app_menu_append (HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (button));
+ gtk_widget_show (GTK_WIDGET (button));
}
void
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->current_edit_tree_view));
gtk_tree_selection_set_mode (selection, reg->mode);
- gtk_tree_selection_unselect_all (selection);
+ if (reg->mode == GTK_SELECTION_SINGLE || reg->mode == GTK_SELECTION_BROWSE) {
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->current_edit_tree_view));
+ if (gtk_tree_model_get_iter_first (model, &iter)) {
+ gtk_tree_view_scroll_to_point (GTK_TREE_VIEW (priv->current_edit_tree_view), 0, 0);
+ gtk_tree_selection_select_iter (selection, &iter);
+ }
+ } else {
+ gtk_tree_selection_unselect_all (selection);
+ }
priv->edit_toolbar = hildon_edit_toolbar_new ();
hildon_edit_toolbar_set_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
gtk_window_fullscreen (GTK_WINDOW (self));
g_signal_emit (G_OBJECT (self), signals[EDIT_MODE_CHANGED_SIGNAL], 0,
- priv->edit_command);
-
+ priv->edit_command, priv->edit_mode);
}
void
if (priv->edit_mode) {
priv->edit_mode = FALSE;
- priv->edit_command = MODEST_HILDON2_WINDOW_EDIT_MODE_NONE;
if (priv->current_edit_tree_view) {
g_object_set (G_OBJECT (priv->current_edit_tree_view),
"hildon-ui-mode", HILDON_UI_MODE_NORMAL,
}
gtk_window_unfullscreen (GTK_WINDOW (self));
g_signal_emit (G_OBJECT (self), signals[EDIT_MODE_CHANGED_SIGNAL], 0,
- priv->edit_command);
-
+ priv->edit_command, priv->edit_mode);
+ priv->edit_command = MODEST_HILDON2_WINDOW_EDIT_MODE_NONE;
}
}
EditModeRegister *reg;
g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
-
+
reg = (EditModeRegister *) g_hash_table_lookup (priv->edit_mode_registry,
GINT_TO_POINTER (priv->edit_command));
- if (reg == NULL)
- modest_hildon2_window_unset_edit_mode (self);
- if ((reg->action == NULL) || reg->action (self))
+ if (reg) {
+ if ((reg->action == NULL) || reg->action (self))
+ modest_hildon2_window_unset_edit_mode (self);
+ } else {
modest_hildon2_window_unset_edit_mode (self);
-
+ }
}
static void
ModestHildon2Window *self)
{
g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
-
+
modest_hildon2_window_unset_edit_mode (self);
}