| Index: chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
|
| deleted file mode 100644
|
| index 88bd1970898949c5839961f34230869d68fce133..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
|
| +++ /dev/null
|
| @@ -1,675 +0,0 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h"
|
| -
|
| -#include <gtk/gtk.h>
|
| -
|
| -#include <set>
|
| -
|
| -#include "base/basictypes.h"
|
| -#include "base/logging.h"
|
| -#include "base/prefs/pref_service.h"
|
| -#include "base/strings/string_util.h"
|
| -#include "base/strings/utf_string_conversions.h"
|
| -#include "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h"
|
| -#include "chrome/browser/bookmarks/bookmark_model.h"
|
| -#include "chrome/browser/bookmarks/bookmark_model_factory.h"
|
| -#include "chrome/browser/bookmarks/bookmark_utils.h"
|
| -#include "chrome/browser/history/history_service.h"
|
| -#include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/ui/bookmarks/bookmark_utils.h"
|
| -#include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h"
|
| -#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
|
| -#include "chrome/browser/ui/gtk/gtk_theme_service.h"
|
| -#include "chrome/browser/ui/gtk/gtk_util.h"
|
| -#include "chrome/browser/ui/gtk/menu_gtk.h"
|
| -#include "chrome/common/net/url_fixer_upper.h"
|
| -#include "components/user_prefs/user_prefs.h"
|
| -#include "grit/chromium_strings.h"
|
| -#include "grit/generated_resources.h"
|
| -#include "grit/locale_settings.h"
|
| -#include "ui/base/gtk/gtk_hig_constants.h"
|
| -#include "ui/base/l10n/l10n_util.h"
|
| -#include "ui/base/models/simple_menu_model.h"
|
| -#include "ui/gfx/gtk_util.h"
|
| -#include "ui/gfx/image/image.h"
|
| -#include "ui/gfx/point.h"
|
| -#include "url/gurl.h"
|
| -
|
| -namespace {
|
| -
|
| -// Background color of text field when URL is invalid.
|
| -const GdkColor kErrorColor = GDK_COLOR_RGB(0xFF, 0xBC, 0xBC);
|
| -
|
| -// Preferred initial dimensions, in pixels, of the folder tree.
|
| -const int kTreeWidth = 300;
|
| -const int kTreeHeight = 150;
|
| -
|
| -typedef std::set<int64> ExpandedNodeIDs;
|
| -
|
| -// Used by ExpandNodes.
|
| -struct ExpandNodesData {
|
| - const ExpandedNodeIDs* ids;
|
| - GtkWidget* tree_view;
|
| -};
|
| -
|
| -// Expands all the nodes in |pointer_data| (which is a ExpandNodesData). This is
|
| -// intended for use by gtk_tree_model_foreach to expand a particular set of
|
| -// nodes.
|
| -gboolean ExpandNodes(GtkTreeModel* model,
|
| - GtkTreePath* path,
|
| - GtkTreeIter* iter,
|
| - gpointer pointer_data) {
|
| - ExpandNodesData* data = reinterpret_cast<ExpandNodesData*>(pointer_data);
|
| - int64 node_id = GetIdFromTreeIter(model, iter);
|
| - if (data->ids->find(node_id) != data->ids->end())
|
| - gtk_tree_view_expand_to_path(GTK_TREE_VIEW(data->tree_view), path);
|
| - return FALSE; // Indicates we want to continue iterating.
|
| -}
|
| -
|
| -// Used by SaveExpandedNodes.
|
| -struct SaveExpandedNodesData {
|
| - // Filled in by SaveExpandedNodes.
|
| - BookmarkExpandedStateTracker::Nodes nodes;
|
| - BookmarkModel* bookmark_model;
|
| -};
|
| -
|
| -// Adds the node at |path| to |pointer_data| (which is a SaveExpandedNodesData).
|
| -// This is intended for use with gtk_tree_view_map_expanded_rows to save all
|
| -// the expanded paths.
|
| -void SaveExpandedNodes(GtkTreeView* tree_view,
|
| - GtkTreePath* path,
|
| - gpointer pointer_data) {
|
| - SaveExpandedNodesData* data =
|
| - reinterpret_cast<SaveExpandedNodesData*>(pointer_data);
|
| - GtkTreeIter iter;
|
| - gtk_tree_model_get_iter(gtk_tree_view_get_model(tree_view), &iter, path);
|
| - const BookmarkNode* node = data->bookmark_model->GetNodeByID(
|
| - GetIdFromTreeIter(gtk_tree_view_get_model(tree_view), &iter));
|
| - if (node)
|
| - data->nodes.insert(node);
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -class BookmarkEditorGtk::ContextMenuController
|
| - : public ui::SimpleMenuModel::Delegate {
|
| - public:
|
| - explicit ContextMenuController(BookmarkEditorGtk* editor)
|
| - : editor_(editor),
|
| - running_menu_for_root_(false) {
|
| - menu_model_.reset(new ui::SimpleMenuModel(this));
|
| - menu_model_->AddItemWithStringId(COMMAND_EDIT, IDS_EDIT);
|
| - menu_model_->AddItemWithStringId(COMMAND_DELETE, IDS_DELETE);
|
| - menu_model_->AddItemWithStringId(
|
| - COMMAND_NEW_FOLDER,
|
| - IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
|
| - menu_.reset(new MenuGtk(NULL, menu_model_.get()));
|
| - }
|
| - virtual ~ContextMenuController() {}
|
| -
|
| - void RunMenu(const gfx::Point& point, guint32 event_time) {
|
| - const BookmarkNode* selected_node = GetSelectedNode();
|
| - if (selected_node)
|
| - running_menu_for_root_ = selected_node->parent()->is_root();
|
| - menu_->PopupAsContext(point, event_time);
|
| - }
|
| -
|
| - void Cancel() {
|
| - editor_ = NULL;
|
| - menu_->Cancel();
|
| - }
|
| -
|
| - private:
|
| - enum ContextMenuCommand {
|
| - COMMAND_DELETE,
|
| - COMMAND_EDIT,
|
| - COMMAND_NEW_FOLDER
|
| - };
|
| -
|
| - // Overridden from ui::SimpleMenuModel::Delegate:
|
| - virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
|
| - if (editor_ == NULL)
|
| - return false;
|
| -
|
| - switch (command_id) {
|
| - case COMMAND_DELETE:
|
| - case COMMAND_EDIT:
|
| - return !running_menu_for_root_;
|
| - case COMMAND_NEW_FOLDER:
|
| - return true;
|
| - }
|
| - return false;
|
| - }
|
| -
|
| - virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
|
| - return false;
|
| - }
|
| -
|
| - virtual bool GetAcceleratorForCommandId(
|
| - int command_id,
|
| - ui::Accelerator* accelerator) OVERRIDE {
|
| - return false;
|
| - }
|
| -
|
| - virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE {
|
| - if (!editor_)
|
| - return;
|
| -
|
| - switch (command_id) {
|
| - case COMMAND_DELETE: {
|
| - GtkTreeIter iter;
|
| - GtkTreeModel* model = NULL;
|
| - if (!gtk_tree_selection_get_selected(editor_->tree_selection_,
|
| - &model,
|
| - &iter)) {
|
| - break;
|
| - }
|
| - const BookmarkNode* selected_node = GetNodeAt(model, &iter);
|
| - if (selected_node) {
|
| - DCHECK(selected_node->is_folder());
|
| - // Deleting an existing bookmark folder. Confirm if it has other
|
| - // bookmarks.
|
| - if (!selected_node->empty()) {
|
| - if (!chrome::ConfirmDeleteBookmarkNode(selected_node,
|
| - GTK_WINDOW(editor_->dialog_)))
|
| - break;
|
| - }
|
| - editor_->deletes_.push_back(selected_node->id());
|
| - }
|
| - gtk_tree_store_remove(editor_->tree_store_, &iter);
|
| - break;
|
| - }
|
| - case COMMAND_EDIT: {
|
| - GtkTreeIter iter;
|
| - if (!gtk_tree_selection_get_selected(editor_->tree_selection_,
|
| - NULL,
|
| - &iter)) {
|
| - return;
|
| - }
|
| -
|
| - GtkTreePath* path = gtk_tree_model_get_path(
|
| - GTK_TREE_MODEL(editor_->tree_store_), &iter);
|
| - gtk_tree_view_expand_to_path(GTK_TREE_VIEW(editor_->tree_view_), path);
|
| -
|
| - // Make the folder name editable.
|
| - gtk_tree_view_set_cursor(GTK_TREE_VIEW(editor_->tree_view_), path,
|
| - gtk_tree_view_get_column(GTK_TREE_VIEW(editor_->tree_view_), 0),
|
| - TRUE);
|
| -
|
| - gtk_tree_path_free(path);
|
| - break;
|
| - }
|
| - case COMMAND_NEW_FOLDER:
|
| - editor_->NewFolder();
|
| - break;
|
| - default:
|
| - NOTREACHED();
|
| - break;
|
| - }
|
| - }
|
| -
|
| - const BookmarkNode* GetNodeAt(GtkTreeModel* model, GtkTreeIter* iter) const {
|
| - int64 id = GetIdFromTreeIter(model, iter);
|
| - return (id > 0) ? editor_->bb_model_->GetNodeByID(id) : NULL;
|
| - }
|
| -
|
| - const BookmarkNode* GetSelectedNode() const {
|
| - GtkTreeModel* model;
|
| - GtkTreeIter iter;
|
| - if (!gtk_tree_selection_get_selected(editor_->tree_selection_,
|
| - &model,
|
| - &iter)) {
|
| - return NULL;
|
| - }
|
| -
|
| - return GetNodeAt(model, &iter);
|
| - }
|
| -
|
| - // The model and view for the right click context menu.
|
| - scoped_ptr<ui::SimpleMenuModel> menu_model_;
|
| - scoped_ptr<MenuGtk> menu_;
|
| -
|
| - // The context menu was brought up for. Set to NULL when the menu is canceled.
|
| - BookmarkEditorGtk* editor_;
|
| -
|
| - // If true, we're running the menu for the bookmark bar or other bookmarks
|
| - // nodes.
|
| - bool running_menu_for_root_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ContextMenuController);
|
| -};
|
| -
|
| -// static
|
| -void BookmarkEditor::Show(gfx::NativeWindow parent_hwnd,
|
| - Profile* profile,
|
| - const EditDetails& details,
|
| - Configuration configuration) {
|
| - DCHECK(profile);
|
| - BookmarkEditorGtk* editor =
|
| - new BookmarkEditorGtk(parent_hwnd,
|
| - profile,
|
| - details.parent_node,
|
| - details,
|
| - configuration);
|
| - editor->Show();
|
| -}
|
| -
|
| -BookmarkEditorGtk::BookmarkEditorGtk(
|
| - GtkWindow* window,
|
| - Profile* profile,
|
| - const BookmarkNode* parent,
|
| - const EditDetails& details,
|
| - BookmarkEditor::Configuration configuration)
|
| - : profile_(profile),
|
| - dialog_(NULL),
|
| - parent_(parent),
|
| - details_(details),
|
| - running_menu_for_root_(false),
|
| - show_tree_(configuration == SHOW_TREE) {
|
| - DCHECK(profile);
|
| - Init(window);
|
| -}
|
| -
|
| -BookmarkEditorGtk::~BookmarkEditorGtk() {
|
| - // The tree model is deleted before the view. Reset the model otherwise the
|
| - // tree will reference a deleted model.
|
| -
|
| - bb_model_->RemoveObserver(this);
|
| -}
|
| -
|
| -void BookmarkEditorGtk::Init(GtkWindow* parent_window) {
|
| - bb_model_ = BookmarkModelFactory::GetForProfile(profile_);
|
| - DCHECK(bb_model_);
|
| - bb_model_->AddObserver(this);
|
| -
|
| - dialog_ = gtk_dialog_new_with_buttons(
|
| - l10n_util::GetStringUTF8(details_.GetWindowTitleId()).c_str(),
|
| - parent_window,
|
| - GTK_DIALOG_MODAL,
|
| - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
|
| - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
|
| - NULL);
|
| -#if !GTK_CHECK_VERSION(2, 22, 0)
|
| - gtk_dialog_set_has_separator(GTK_DIALOG(dialog_), FALSE);
|
| -#endif
|
| -
|
| - if (show_tree_) {
|
| - GtkWidget* action_area = gtk_dialog_get_action_area(GTK_DIALOG(dialog_));
|
| - new_folder_button_ = gtk_button_new_with_label(
|
| - l10n_util::GetStringUTF8(
|
| - IDS_BOOKMARK_EDITOR_NEW_FOLDER_BUTTON).c_str());
|
| - g_signal_connect(new_folder_button_, "clicked",
|
| - G_CALLBACK(OnNewFolderClickedThunk), this);
|
| - gtk_container_add(GTK_CONTAINER(action_area), new_folder_button_);
|
| - gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(action_area),
|
| - new_folder_button_, TRUE);
|
| - }
|
| -
|
| - gtk_dialog_set_default_response(GTK_DIALOG(dialog_), GTK_RESPONSE_ACCEPT);
|
| -
|
| - // The GTK dialog content area layout (overview)
|
| - //
|
| - // +- GtkVBox |vbox| ----------------------------------------------+
|
| - // |+- GtkTable |table| ------------------------------------------+|
|
| - // ||+- GtkLabel ------+ +- GtkEntry |name_entry_| --------------+||
|
| - // ||| | | |||
|
| - // ||+-----------------+ +---------------------------------------+||
|
| - // ||+- GtkLabel ------+ +- GtkEntry |url_entry_| ---------------+|| *
|
| - // ||| | | |||
|
| - // ||+-----------------+ +---------------------------------------+||
|
| - // |+-------------------------------------------------------------+|
|
| - // |+- GtkScrollWindow |scroll_window| ---------------------------+|
|
| - // ||+- GtkTreeView |tree_view_| --------------------------------+||
|
| - // |||+- GtkTreeViewColumn |name_column| -----------------------+|||
|
| - // |||| ||||
|
| - // |||| ||||
|
| - // |||| ||||
|
| - // |||| ||||
|
| - // |||+---------------------------------------------------------+|||
|
| - // ||+-----------------------------------------------------------+||
|
| - // |+-------------------------------------------------------------+|
|
| - // +---------------------------------------------------------------+
|
| - //
|
| - // * The url and corresponding label are not shown if creating a new folder.
|
| - GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog_));
|
| - gtk_box_set_spacing(GTK_BOX(content_area), ui::kContentAreaSpacing);
|
| -
|
| - GtkWidget* vbox = gtk_vbox_new(FALSE, 12);
|
| -
|
| - name_entry_ = gtk_entry_new();
|
| - std::string title;
|
| - GURL url;
|
| - if (details_.type == EditDetails::EXISTING_NODE) {
|
| - title = base::UTF16ToUTF8(details_.existing_node->GetTitle());
|
| - url = details_.existing_node->url();
|
| - } else if (details_.type == EditDetails::NEW_FOLDER) {
|
| - title = l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME);
|
| - } else if (details_.type == EditDetails::NEW_URL) {
|
| - url = details_.url;
|
| - title = base::UTF16ToUTF8(details_.title);
|
| - }
|
| - gtk_entry_set_text(GTK_ENTRY(name_entry_), title.c_str());
|
| - g_signal_connect(name_entry_, "changed",
|
| - G_CALLBACK(OnEntryChangedThunk), this);
|
| - gtk_entry_set_activates_default(GTK_ENTRY(name_entry_), TRUE);
|
| -
|
| - GtkWidget* table;
|
| - if (details_.GetNodeType() != BookmarkNode::FOLDER) {
|
| - url_entry_ = gtk_entry_new();
|
| - PrefService* prefs =
|
| - profile_ ? user_prefs::UserPrefs::Get(profile_) : NULL;
|
| - gtk_entry_set_text(
|
| - GTK_ENTRY(url_entry_),
|
| - base::UTF16ToUTF8(
|
| - chrome::FormatBookmarkURLForDisplay(url, prefs)).c_str());
|
| - g_signal_connect(url_entry_, "changed",
|
| - G_CALLBACK(OnEntryChangedThunk), this);
|
| - gtk_entry_set_activates_default(GTK_ENTRY(url_entry_), TRUE);
|
| - table = gtk_util::CreateLabeledControlsGroup(NULL,
|
| - l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_NAME_LABEL).c_str(),
|
| - name_entry_,
|
| - l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_URL_LABEL).c_str(),
|
| - url_entry_,
|
| - NULL);
|
| -
|
| - } else {
|
| - url_entry_ = NULL;
|
| - table = gtk_util::CreateLabeledControlsGroup(NULL,
|
| - l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_NAME_LABEL).c_str(),
|
| - name_entry_,
|
| - NULL);
|
| - }
|
| -
|
| - gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
|
| -
|
| - if (show_tree_) {
|
| - GtkTreeIter selected_iter;
|
| - int64 selected_id = 0;
|
| - if (details_.type == EditDetails::EXISTING_NODE)
|
| - selected_id = details_.existing_node->parent()->id();
|
| - else if (parent_)
|
| - selected_id = parent_->id();
|
| - tree_store_ = MakeFolderTreeStore();
|
| - AddToTreeStore(bb_model_, selected_id, tree_store_, &selected_iter);
|
| - tree_view_ = MakeTreeViewForStore(tree_store_);
|
| - gtk_widget_set_size_request(tree_view_, kTreeWidth, kTreeHeight);
|
| - tree_selection_ = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view_));
|
| - g_signal_connect(tree_view_, "button-press-event",
|
| - G_CALLBACK(OnTreeViewButtonPressEventThunk), this);
|
| -
|
| - BookmarkExpandedStateTracker::Nodes expanded_nodes =
|
| - bb_model_->expanded_state_tracker()->GetExpandedNodes();
|
| - if (!expanded_nodes.empty()) {
|
| - ExpandedNodeIDs ids;
|
| - for (BookmarkExpandedStateTracker::Nodes::iterator i =
|
| - expanded_nodes.begin(); i != expanded_nodes.end(); ++i) {
|
| - ids.insert((*i)->id());
|
| - }
|
| - ExpandNodesData data = { &ids, tree_view_ };
|
| - gtk_tree_model_foreach(GTK_TREE_MODEL(tree_store_), &ExpandNodes,
|
| - reinterpret_cast<gpointer>(&data));
|
| - }
|
| -
|
| - GtkTreePath* path = NULL;
|
| - if (selected_id) {
|
| - path = gtk_tree_model_get_path(GTK_TREE_MODEL(tree_store_),
|
| - &selected_iter);
|
| - } else {
|
| - // We don't have a selected parent (Probably because we're making a new
|
| - // bookmark). Select the first item in the list.
|
| - path = gtk_tree_path_new_from_string("0");
|
| - }
|
| -
|
| - gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tree_view_), path);
|
| - gtk_tree_selection_select_path(tree_selection_, path);
|
| - gtk_tree_path_free(path);
|
| -
|
| - GtkWidget* scroll_window = gtk_scrolled_window_new(NULL, NULL);
|
| - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window),
|
| - GTK_POLICY_NEVER,
|
| - GTK_POLICY_AUTOMATIC);
|
| - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll_window),
|
| - GTK_SHADOW_ETCHED_IN);
|
| - gtk_container_add(GTK_CONTAINER(scroll_window), tree_view_);
|
| -
|
| - gtk_box_pack_start(GTK_BOX(vbox), scroll_window, TRUE, TRUE, 0);
|
| -
|
| - g_signal_connect(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view_)),
|
| - "changed", G_CALLBACK(OnSelectionChangedThunk), this);
|
| - }
|
| -
|
| - gtk_box_pack_start(GTK_BOX(content_area), vbox, TRUE, TRUE, 0);
|
| -
|
| - g_signal_connect(dialog_, "response",
|
| - G_CALLBACK(OnResponseThunk), this);
|
| - g_signal_connect(dialog_, "delete-event",
|
| - G_CALLBACK(OnWindowDeleteEventThunk), this);
|
| - g_signal_connect(dialog_, "destroy",
|
| - G_CALLBACK(OnWindowDestroyThunk), this);
|
| -}
|
| -
|
| -void BookmarkEditorGtk::Show() {
|
| - // Manually call our OnEntryChanged handler to set the initial state.
|
| - OnEntryChanged(NULL);
|
| -
|
| - gtk_util::ShowDialog(dialog_);
|
| -}
|
| -
|
| -void BookmarkEditorGtk::Close() {
|
| - // Under the model that we've inherited from Windows, dialogs can receive
|
| - // more than one Close() call inside the current message loop event.
|
| - if (dialog_) {
|
| - gtk_widget_destroy(dialog_);
|
| - dialog_ = NULL;
|
| - }
|
| -}
|
| -
|
| -void BookmarkEditorGtk::BookmarkNodeMoved(BookmarkModel* model,
|
| - const BookmarkNode* old_parent,
|
| - int old_index,
|
| - const BookmarkNode* new_parent,
|
| - int new_index) {
|
| - Reset();
|
| -}
|
| -
|
| -void BookmarkEditorGtk::BookmarkNodeAdded(BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int index) {
|
| - Reset();
|
| -}
|
| -
|
| -void BookmarkEditorGtk::BookmarkNodeRemoved(BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int index,
|
| - const BookmarkNode* node) {
|
| - if ((details_.type == EditDetails::EXISTING_NODE &&
|
| - details_.existing_node->HasAncestor(node)) ||
|
| - (parent_ && parent_->HasAncestor(node))) {
|
| - // The node, or its parent was removed. Close the dialog.
|
| - Close();
|
| - } else {
|
| - Reset();
|
| - }
|
| -}
|
| -
|
| -void BookmarkEditorGtk::BookmarkAllNodesRemoved(BookmarkModel* model) {
|
| - Reset();
|
| -}
|
| -
|
| -void BookmarkEditorGtk::BookmarkNodeChildrenReordered(
|
| - BookmarkModel* model, const BookmarkNode* node) {
|
| - Reset();
|
| -}
|
| -
|
| -void BookmarkEditorGtk::Reset() {
|
| - // TODO(erg): The windows implementation tries to be smart. For now, just
|
| - // close the window.
|
| - Close();
|
| -}
|
| -
|
| -GURL BookmarkEditorGtk::GetInputURL() const {
|
| - if (!url_entry_)
|
| - return GURL(); // Happens when we're editing a folder.
|
| - return URLFixerUpper::FixupURL(gtk_entry_get_text(GTK_ENTRY(url_entry_)),
|
| - std::string());
|
| -}
|
| -
|
| -base::string16 BookmarkEditorGtk::GetInputTitle() const {
|
| - return base::UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(name_entry_)));
|
| -}
|
| -
|
| -void BookmarkEditorGtk::ApplyEdits() {
|
| - DCHECK(bb_model_->loaded());
|
| -
|
| - GtkTreeIter currently_selected_iter;
|
| - if (show_tree_) {
|
| - if (!gtk_tree_selection_get_selected(tree_selection_, NULL,
|
| - ¤tly_selected_iter)) {
|
| - ApplyEdits(NULL);
|
| - return;
|
| - }
|
| - }
|
| -
|
| - ApplyEdits(¤tly_selected_iter);
|
| -}
|
| -
|
| -void BookmarkEditorGtk::ApplyEdits(GtkTreeIter* selected_parent) {
|
| - // We're going to apply edits to the bookmark bar model, which will call us
|
| - // back. Normally when a structural edit occurs we reset the tree model.
|
| - // We don't want to do that here, so we remove ourselves as an observer.
|
| - bb_model_->RemoveObserver(this);
|
| -
|
| - GURL new_url(GetInputURL());
|
| - base::string16 new_title(GetInputTitle());
|
| -
|
| - if (!show_tree_ || !selected_parent) {
|
| - // TODO: this is wrong. Just because there is no selection doesn't mean new
|
| - // folders weren't added.
|
| - BookmarkEditor::ApplyEditsWithNoFolderChange(
|
| - bb_model_, parent_, details_, new_title, new_url);
|
| - return;
|
| - }
|
| -
|
| - // Create the new folders and update the titles.
|
| - const BookmarkNode* new_parent = CommitTreeStoreDifferencesBetween(
|
| - bb_model_, tree_store_, selected_parent);
|
| -
|
| - SaveExpandedNodesData data;
|
| - data.bookmark_model = bb_model_;
|
| - gtk_tree_view_map_expanded_rows(GTK_TREE_VIEW(tree_view_),
|
| - &SaveExpandedNodes,
|
| - reinterpret_cast<gpointer>(&data));
|
| - bb_model_->expanded_state_tracker()->SetExpandedNodes(data.nodes);
|
| -
|
| - if (!new_parent) {
|
| - // Bookmarks must be parented.
|
| - NOTREACHED();
|
| - return;
|
| - }
|
| -
|
| - BookmarkEditor::ApplyEditsWithPossibleFolderChange(
|
| - bb_model_, new_parent, details_, new_title, new_url);
|
| -
|
| - // Remove the folders that were removed. This has to be done after all the
|
| - // other changes have been committed.
|
| - bookmark_utils::DeleteBookmarkFolders(bb_model_, deletes_);
|
| -}
|
| -
|
| -void BookmarkEditorGtk::AddNewFolder(GtkTreeIter* parent, GtkTreeIter* child) {
|
| - gtk_tree_store_append(tree_store_, child, parent);
|
| - gtk_tree_store_set(
|
| - tree_store_,
|
| - child,
|
| - FOLDER_ICON, GtkThemeService::GetFolderIcon(true).ToGdkPixbuf(),
|
| - FOLDER_NAME,
|
| - l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME).c_str(),
|
| - ITEM_ID, static_cast<int64>(0),
|
| - IS_EDITABLE, TRUE,
|
| - -1);
|
| -}
|
| -
|
| -void BookmarkEditorGtk::OnSelectionChanged(GtkWidget* selection) {
|
| - if (!gtk_tree_selection_get_selected(tree_selection_, NULL, NULL))
|
| - gtk_widget_set_sensitive(new_folder_button_, FALSE);
|
| - else
|
| - gtk_widget_set_sensitive(new_folder_button_, TRUE);
|
| -}
|
| -
|
| -void BookmarkEditorGtk::OnResponse(GtkWidget* dialog, int response_id) {
|
| - if (response_id == GTK_RESPONSE_ACCEPT)
|
| - ApplyEdits();
|
| -
|
| - Close();
|
| -}
|
| -
|
| -gboolean BookmarkEditorGtk::OnWindowDeleteEvent(GtkWidget* widget,
|
| - GdkEvent* event) {
|
| - Close();
|
| -
|
| - // Return true to prevent the gtk dialog from being destroyed. Close will
|
| - // destroy it for us and the default gtk_dialog_delete_event_handler() will
|
| - // force the destruction without us being able to stop it.
|
| - return TRUE;
|
| -}
|
| -
|
| -void BookmarkEditorGtk::OnWindowDestroy(GtkWidget* widget) {
|
| - base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
|
| -}
|
| -
|
| -void BookmarkEditorGtk::OnEntryChanged(GtkWidget* entry) {
|
| - gboolean can_close = TRUE;
|
| - if (details_.GetNodeType() != BookmarkNode::FOLDER) {
|
| - if (GetInputURL().is_valid()) {
|
| - gtk_widget_modify_base(url_entry_, GTK_STATE_NORMAL, NULL);
|
| - } else {
|
| - gtk_widget_modify_base(url_entry_, GTK_STATE_NORMAL, &kErrorColor);
|
| - can_close = FALSE;
|
| - }
|
| - }
|
| - gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog_), GTK_RESPONSE_ACCEPT,
|
| - can_close);
|
| -}
|
| -
|
| -void BookmarkEditorGtk::OnNewFolderClicked(GtkWidget* button) {
|
| - NewFolder();
|
| -}
|
| -
|
| -gboolean BookmarkEditorGtk::OnTreeViewButtonPressEvent(GtkWidget* widget,
|
| - GdkEventButton* event) {
|
| - if (event->button == 3) {
|
| - if (!menu_controller_.get())
|
| - menu_controller_.reset(new ContextMenuController(this));
|
| - menu_controller_->RunMenu(gfx::Point(event->x_root, event->y_root),
|
| - event->time);
|
| - }
|
| -
|
| - return FALSE;
|
| -}
|
| -
|
| -void BookmarkEditorGtk::NewFolder() {
|
| - GtkTreeIter iter;
|
| - if (!gtk_tree_selection_get_selected(tree_selection_,
|
| - NULL,
|
| - &iter)) {
|
| - NOTREACHED() << "Something should always be selected if New Folder " <<
|
| - "is clicked";
|
| - return;
|
| - }
|
| -
|
| - GtkTreeIter new_item_iter;
|
| - AddNewFolder(&iter, &new_item_iter);
|
| -
|
| - GtkTreePath* path = gtk_tree_model_get_path(
|
| - GTK_TREE_MODEL(tree_store_), &new_item_iter);
|
| - gtk_tree_view_expand_to_path(GTK_TREE_VIEW(tree_view_), path);
|
| -
|
| - // Make the folder name editable.
|
| - gtk_tree_view_set_cursor(GTK_TREE_VIEW(tree_view_), path,
|
| - gtk_tree_view_get_column(GTK_TREE_VIEW(tree_view_), 0),
|
| - TRUE);
|
| -
|
| - gtk_tree_path_free(path);
|
| -}
|
|
|