Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(691)

Side by Side Diff: chrome/browser/gtk/bookmark_manager_gtk.cc

Issue 165194: GTK: Use stock icons for bookmark folder and default favicon.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/gtk/bookmark_editor_gtk.cc ('k') | chrome/browser/gtk/bookmark_tree_model.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/gtk/bookmark_manager_gtk.h" 5 #include "chrome/browser/gtk/bookmark_manager_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 NOTIMPLEMENTED(); 604 NOTIMPLEMENTED();
605 #endif 605 #endif
606 } 606 }
607 607
608 void BookmarkManagerGtk::BuildLeftStore() { 608 void BookmarkManagerGtk::BuildLeftStore() {
609 GtkTreeIter select_iter; 609 GtkTreeIter select_iter;
610 bookmark_utils::AddToTreeStore(model_, 610 bookmark_utils::AddToTreeStore(model_,
611 model_->GetBookmarkBarNode()->id(), left_store_, &select_iter); 611 model_->GetBookmarkBarNode()->id(), left_store_, &select_iter);
612 gtk_tree_selection_select_iter(left_selection(), &select_iter); 612 gtk_tree_selection_select_iter(left_selection(), &select_iter);
613 613
614 // TODO(estade): is there a decent stock icon we can use here?
614 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 615 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
615 gtk_tree_store_append(left_store_, &select_iter, NULL); 616 gtk_tree_store_append(left_store_, &select_iter, NULL);
616 gtk_tree_store_set(left_store_, &select_iter, 617 gtk_tree_store_set(left_store_, &select_iter,
617 bookmark_utils::FOLDER_ICON, 618 bookmark_utils::FOLDER_ICON,
618 rb.GetPixbufNamed(IDR_BOOKMARK_MANAGER_RECENT_ICON), 619 rb.GetPixbufNamed(IDR_BOOKMARK_MANAGER_RECENT_ICON),
619 bookmark_utils::FOLDER_NAME, 620 bookmark_utils::FOLDER_NAME,
620 l10n_util::GetStringUTF8( 621 l10n_util::GetStringUTF8(
621 IDS_BOOKMARK_TREE_RECENTLY_BOOKMARKED_NODE_TITLE).c_str(), 622 IDS_BOOKMARK_TREE_RECENTLY_BOOKMARKED_NODE_TITLE).c_str(),
622 bookmark_utils::ITEM_ID, kRecentID, 623 bookmark_utils::ITEM_ID, kRecentID,
623 -1); 624 -1);
624 625
626 GdkPixbuf* search_icon = gtk_widget_render_icon(
627 window_, GTK_STOCK_FIND, GTK_ICON_SIZE_MENU, NULL);
625 gtk_tree_store_append(left_store_, &select_iter, NULL); 628 gtk_tree_store_append(left_store_, &select_iter, NULL);
626 gtk_tree_store_set(left_store_, &select_iter, 629 gtk_tree_store_set(left_store_, &select_iter,
627 bookmark_utils::FOLDER_ICON, 630 bookmark_utils::FOLDER_ICON,
628 rb.GetPixbufNamed(IDR_BOOKMARK_MANAGER_SEARCH_ICON), 631 search_icon,
629 bookmark_utils::FOLDER_NAME, 632 bookmark_utils::FOLDER_NAME,
630 l10n_util::GetStringUTF8( 633 l10n_util::GetStringUTF8(
631 IDS_BOOKMARK_TREE_SEARCH_NODE_TITLE).c_str(), 634 IDS_BOOKMARK_TREE_SEARCH_NODE_TITLE).c_str(),
632 bookmark_utils::ITEM_ID, kSearchID, 635 bookmark_utils::ITEM_ID, kSearchID,
633 -1); 636 -1);
637 g_object_unref(search_icon);
634 } 638 }
635 639
636 void BookmarkManagerGtk::BuildRightStore() { 640 void BookmarkManagerGtk::BuildRightStore() {
637 const BookmarkNode* node = GetFolder(); 641 const BookmarkNode* node = GetFolder();
638 642
639 gtk_list_store_clear(right_store_); 643 gtk_list_store_clear(right_store_);
640 644
641 if (node) { 645 if (node) {
642 SaveColumnConfiguration(); 646 SaveColumnConfiguration();
643 gtk_tree_view_column_set_visible(path_column_, FALSE); 647 gtk_tree_view_column_set_visible(path_column_, FALSE);
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 } 732 }
729 g_list_free(paths); 733 g_list_free(paths);
730 734
731 return nodes; 735 return nodes;
732 } 736 }
733 737
734 void BookmarkManagerGtk::SetRightSideColumnValues(int row, GtkTreeIter* iter) { 738 void BookmarkManagerGtk::SetRightSideColumnValues(int row, GtkTreeIter* iter) {
735 // TODO(estade): building the path could be optimized out when we aren't 739 // TODO(estade): building the path could be optimized out when we aren't
736 // showing the path column. 740 // showing the path column.
737 const BookmarkNode* node = right_tree_model_->GetNodeForRow(row); 741 const BookmarkNode* node = right_tree_model_->GetNodeForRow(row);
738 GdkPixbuf* pixbuf = bookmark_utils::GetPixbufForNode(node, model_); 742 GdkPixbuf* pixbuf = bookmark_utils::GetPixbufForNode(node, model_, true);
739 std::wstring title = 743 std::wstring title =
740 right_tree_model_->GetText(row, IDS_BOOKMARK_TABLE_TITLE); 744 right_tree_model_->GetText(row, IDS_BOOKMARK_TABLE_TITLE);
741 std::wstring url = right_tree_model_->GetText(row, IDS_BOOKMARK_TABLE_URL); 745 std::wstring url = right_tree_model_->GetText(row, IDS_BOOKMARK_TABLE_URL);
742 std::wstring path = right_tree_model_->GetText(row, IDS_BOOKMARK_TABLE_PATH); 746 std::wstring path = right_tree_model_->GetText(row, IDS_BOOKMARK_TABLE_PATH);
743 gtk_list_store_set(right_store_, iter, 747 gtk_list_store_set(right_store_, iter,
744 RIGHT_PANE_PIXBUF, pixbuf, 748 RIGHT_PANE_PIXBUF, pixbuf,
745 RIGHT_PANE_TITLE, WideToUTF8(title).c_str(), 749 RIGHT_PANE_TITLE, WideToUTF8(title).c_str(),
746 RIGHT_PANE_URL, WideToUTF8(url).c_str(), 750 RIGHT_PANE_URL, WideToUTF8(url).c_str(),
747 RIGHT_PANE_PATH, WideToUTF8(path).c_str(), 751 RIGHT_PANE_PATH, WideToUTF8(path).c_str(),
748 RIGHT_PANE_ID, node->id(), -1); 752 RIGHT_PANE_ID, node->id(), -1);
(...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after
1421 } else if (id == IDS_BOOKMARK_MANAGER_EXPORT_MENU) { 1425 } else if (id == IDS_BOOKMARK_MANAGER_EXPORT_MENU) {
1422 if (g_browser_process->io_thread()) { 1426 if (g_browser_process->io_thread()) {
1423 bookmark_html_writer::WriteBookmarks( 1427 bookmark_html_writer::WriteBookmarks(
1424 g_browser_process->io_thread()->message_loop(), model_, 1428 g_browser_process->io_thread()->message_loop(), model_,
1425 path.ToWStringHack()); 1429 path.ToWStringHack());
1426 } 1430 }
1427 } else { 1431 } else {
1428 NOTREACHED(); 1432 NOTREACHED();
1429 } 1433 }
1430 } 1434 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/bookmark_editor_gtk.cc ('k') | chrome/browser/gtk/bookmark_tree_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698