← Back to branch summary

~noskcaj/ubuntu/trusty/xfdesktop4/4.11.2-1

« back to all changes in this revision

Viewing changes to src/xfdesktop-file-icon-manager.c

  • Committer: Package Import Robot
  • Author(s): Lionel Le Folgoc
  • Date: 2012-05-18 22:18:02 UTC
  • mfrom: (3.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20120518221802-htmj6h4apaij25l2
Tags: 4.10.0-1ubuntu1
* Merge from Debian experimental, remaining Ubuntu change:
  - debian/patches/xubuntu_improve-nautilus-interactions.patch: added,
    should prevent nautilus from taking over the desktop if xfdesktop is
    running (and vice-versa).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xfdesktop-file-icon-manager.c
278
278
                                    g_param_spec_boolean("show-thumbnails",
279
279
                                                         "show-thumbnails",
280
280
                                                         "show-thumbnails",
281
 
                                                         FALSE,
 
281
                                                         TRUE,
282
282
                                                         XFDESKTOP_PARAM_FLAGS));
283
283
#undef XFDESKTOP_PARAM_FLAGS
284
284
 
899
899
}
900
900
 
901
901
static void
 
902
xfdesktop_file_icon_menu_arrange_icons(GtkWidget *widget,
 
903
                                       gpointer user_data)
 
904
{
 
905
    XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data);
 
906
    xfdesktop_icon_view_sort_icons(fmanager->priv->icon_view);
 
907
}
 
908
 
 
909
static void
902
910
xfdesktop_file_icon_menu_properties(GtkWidget *widget,
903
911
                                    gpointer user_data)
904
912
{
1711
1719
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
1712
1720
        
1713
1721
        if(file_icon == fmanager->priv->desktop_icon) {
 
1722
            img = gtk_image_new_from_stock(GTK_STOCK_SORT_ASCENDING, GTK_ICON_SIZE_MENU);
 
1723
            gtk_widget_show(img);
 
1724
            mi = gtk_image_menu_item_new_with_mnemonic(_("Arrange Desktop _Icons"));
 
1725
            gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
 
1726
            gtk_widget_show(mi);
 
1727
            gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
 
1728
            g_signal_connect(G_OBJECT(mi), "activate",
 
1729
                             G_CALLBACK(xfdesktop_file_icon_menu_arrange_icons),
 
1730
                             fmanager);
 
1731
 
1714
1732
            img = gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU);
1715
1733
            gtk_widget_show(img);
1716
1734
            mi = gtk_image_menu_item_new_with_mnemonic(_("Desktop _Settings..."));
1723
1741
        
1724
1742
        img = gtk_image_new_from_stock(GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU);
1725
1743
        gtk_widget_show(img);
1726
 
        mi = gtk_image_menu_item_new_with_mnemonic(_("_Properties..."));
 
1744
        mi = gtk_image_menu_item_new_with_mnemonic(_("P_roperties..."));
1727
1745
        gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
1728
1746
        gtk_widget_show(mi);
1729
1747
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
1763
1781
    XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data);
1764
1782
    gchar relpath[PATH_MAX], *tmppath, *path;
1765
1783
    XfceRc *rcfile;
 
1784
    gint x = 0, y = 0, width = 0, height = 0;
1766
1785
    
1767
1786
    fmanager->priv->save_icons_id = 0;
1768
 
    
 
1787
 
 
1788
    xfdesktop_get_workarea_single(fmanager->priv->icon_view,
 
1789
                                  0,
 
1790
                                  &x,
 
1791
                                  &y,
 
1792
                                  &width,
 
1793
                                  &height);
 
1794
 
1769
1795
    g_snprintf(relpath, PATH_MAX, "xfce4/desktop/icons.screen%d-%dx%d.rc",
1770
1796
               gdk_screen_get_number(fmanager->priv->gscreen),
1771
 
               gdk_screen_get_width(fmanager->priv->gscreen),
1772
 
               gdk_screen_get_height(fmanager->priv->gscreen));
 
1797
               width,
 
1798
               height);
 
1799
 
1773
1800
    path = xfce_resource_save_location(XFCE_RESOURCE_CONFIG, relpath, TRUE);
1774
1801
    if(!path)
1775
1802
        return FALSE;
1835
1862
    gchar relpath[PATH_MAX];
1836
1863
    gchar *filename = NULL;
1837
1864
    gboolean ret = FALSE;
 
1865
    gint x = 0, y = 0, width = 0, height = 0;
 
1866
 
 
1867
    xfdesktop_get_workarea_single(fmanager->priv->icon_view,
 
1868
                                  0,
 
1869
                                  &x,
 
1870
                                  &y,
 
1871
                                  &width,
 
1872
                                  &height);
1838
1873
    
1839
1874
    g_snprintf(relpath, PATH_MAX, "xfce4/desktop/icons.screen%d-%dx%d.rc",
1840
1875
               gdk_screen_get_number(fmanager->priv->gscreen),
1841
 
               gdk_screen_get_width(fmanager->priv->gscreen),
1842
 
               gdk_screen_get_height(fmanager->priv->gscreen));
 
1876
               width,
 
1877
               height);
 
1878
 
1843
1879
    filename = xfce_resource_lookup(XFCE_RESOURCE_CONFIG, relpath);
1844
1880
 
1845
1881
    /* Check if we have to migrate from the old file format */
2899
2935
                                guint time_)
2900
2936
{
2901
2937
    static GdkDragAction    actions[] = { GDK_ACTION_COPY, GDK_ACTION_MOVE, GDK_ACTION_LINK };
2902
 
    static const gchar      *action_names[] = { N_ ("_Copy here") , N_ ("_Move here") , N_ ("_Link here") };
 
2938
    static const gchar      *action_names[] = { N_ ("Copy _Here") , N_ ("_Move Here") , N_ ("_Link Here") };
2903
2939
    static const gchar      *action_icons[] = { "stock_folder-copy", "stock_folder-move", NULL };
2904
2940
    GtkWidget *menu;
2905
2941
    GtkWidget *item;