← Back to branch summary

~ubuntu-branches/ubuntu/utopic/thunar/utopic-proposed

« back to all changes in this revision

Viewing changes to thunar/thunar-launcher.c

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2014-04-05 08:22:40 UTC
  • Revision ID: package-import@ubuntu.com-20140405082240-b3iiyypyyo3uliy3
Tags: 1.6.3-1ubuntu5
https://launchpad.net/bugs/1186846
https://launchpad.net/bugs/1271861
* Add git-save-keyboard-shortcuts.patch. LP: #1186846
  - Keyboard shortcuts save when changed rather than when thunar is closed
* Add menu-icon-tweaks.patch. LP: #1271861
  - Don't use generic folder icons for open with default application
  - Add icons for open in new tab, new window
* Add git-force-toolbr-icons.patch
  - Fix for "Home" and "Open Parent" icons going missing from toolbar

Show diffs side-by-side

added added

removed removed

Lines of Context:
thunar/thunar-launcher.c
815
815
       ** - "Open", "Open in n New Windows" and "Open in n New Tabs" actions
816
816
       **/
817
817
 
818
 
      /* Prepare "Open" label */
 
818
      /* Prepare "Open" label and icon */
819
819
      gtk_action_set_label (launcher->action_open, _("_Open"));
 
820
      gtk_action_set_stock_id (launcher->action_open, GTK_STOCK_OPEN);
820
821
 
821
822
      if (n_selected_files == n_directories && n_directories >= 1)
822
823
        {
928
929
          /* turn the "Open" action into "Execute" */
929
930
          g_object_set (G_OBJECT (launcher->action_open),
930
931
                        "label", _("_Execute"),
 
932
                        "stock-id", GTK_STOCK_EXECUTE,
931
933
                        "tooltip", ngettext ("Execute the selected file", "Execute the selected files", n_selected_files),
932
934
                        NULL);
933
935
        }
945
947
          g_free (tooltip);
946
948
          g_free (label);
947
949
 
 
950
          /* load default application icon */
 
951
          gtk_action_set_stock_id (launcher->action_open, NULL);
 
952
          gtk_action_set_gicon (launcher->action_open, g_app_info_get_icon (applications->data));
 
953
 
948
954
          /* remember the default application for the "Open" action */
949
955
          g_object_set_qdata_full (G_OBJECT (launcher->action_open), thunar_launcher_handler_quark, applications->data, g_object_unref);
950
956