← Back to branch summary

~ubuntu-branches/ubuntu/saucy/geary/saucy-updates

« back to all changes in this revision

Viewing changes to src/client/ui/main-toolbar.vala

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2013-10-10 17:40:37 UTC
  • mfrom: (1.1.8)
  • Revision ID: package-import@ubuntu.com-20131010174037-5p5o4dlsoewek2kg
Tags: 0.4.0-0ubuntu1
New stable version

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/ui/main-toolbar.vala
25
25
        base(GearyApplication.instance.actions);
26
26
        GearyApplication.instance.controller.account_selected.connect(on_account_changed);
27
27
        
 
28
        bool rtl = get_direction() == Gtk.TextDirection.RTL;
 
29
        
28
30
        // Assemble mark menu.
29
31
        GearyApplication.instance.load_ui_file("toolbar_mark_menu.ui");
30
32
        Gtk.Menu mark_menu = (Gtk.Menu) GearyApplication.instance.ui_manager.get_widget("/ui/ToolbarMarkMenu");
46
48
        
47
49
        // Reply buttons
48
50
        insert.clear();
49
 
        insert.add(create_toolbar_button("reply-symbolic", GearyController.ACTION_REPLY_TO_MESSAGE));
50
 
        insert.add(create_toolbar_button("reply-all-symbolic", GearyController.ACTION_REPLY_ALL_MESSAGE));
51
 
        insert.add(create_toolbar_button("forward-symbolic", GearyController.ACTION_FORWARD_MESSAGE));
 
51
        insert.add(create_toolbar_button(rtl ? "reply-rtl-symbolic" : "reply-symbolic", GearyController.ACTION_REPLY_TO_MESSAGE));
 
52
        insert.add(create_toolbar_button(rtl ? "reply-all-rtl-symbolic" : "reply-all-symbolic", GearyController.ACTION_REPLY_ALL_MESSAGE));
 
53
        insert.add(create_toolbar_button(rtl ? "forward-rtl-symbolic" : "forward-symbolic", GearyController.ACTION_FORWARD_MESSAGE));
52
54
        add(create_pill_buttons(insert));
53
55
        
54
56
        // Mark, copy, move.
55
57
        insert.clear();
56
58
        insert.add(create_menu_button("marker-symbolic", mark_menu, GearyController.ACTION_MARK_AS_MENU));
57
 
        insert.add(create_menu_button("tag-symbolic", copy_folder_menu, GearyController.ACTION_COPY_MENU));
 
59
        insert.add(create_menu_button(rtl ? "tag-rtl-symbolic" : "tag-symbolic", copy_folder_menu, GearyController.ACTION_COPY_MENU));
58
60
        insert.add(create_menu_button("folder-symbolic", move_folder_menu, GearyController.ACTION_MOVE_MENU));
59
61
        add(create_pill_buttons(insert));
60
62
        
82
84
        search_container.add(search_entry);
83
85
        add(search_container);
84
86
        
 
87
        // Search upgrade progress bar.
 
88
        search_upgrade_progress_bar.margin_top = 3;
 
89
        search_upgrade_progress_bar.margin_bottom = 3;
 
90
        search_upgrade_progress_bar.show_text = true;
 
91
        
 
92
        // Set the progress bar's width to match the search entry's width.
 
93
        int minimum_width = 0;
 
94
        int natural_width = 0;
 
95
        search_entry.get_preferred_width(out minimum_width, out natural_width);
 
96
        search_upgrade_progress_bar.width_request = minimum_width;
 
97
        
85
98
        // Application button.
86
99
        insert.clear();
87
100
        insert.add(create_menu_button("emblem-system-symbolic", application_menu, GearyController.ACTION_GEAR_MENU));