--- ./xfdesktop-4.10.0.orig/./common/xfdesktop-common.h 2012-04-29 00:53:05.000000000 +0400 +++ ./xfdesktop-4.10.0/./common/xfdesktop-common.h 2012-09-13 12:45:57.066031019 +0400 @@ -36,6 +36,7 @@ #define DEFAULT_BACKDROP_LIST "xfce4/desktop/backdrop.list" #define DEFAULT_ICON_FONT_SIZE 12 #define DEFAULT_ICON_SIZE 32 +#define DEFAULT_LABEL_LINES 2 #define ITHEME_FLAGS (GTK_ICON_LOOKUP_USE_BUILTIN \ | GTK_ICON_LOOKUP_GENERIC_FALLBACK \ | GTK_ICON_LOOKUP_FORCE_SIZE) --- ./xfdesktop-4.10.0.orig/./settings/xfdesktop-settings-ui.h 2012-04-29 00:53:17.000000000 +0400 +++ ./xfdesktop-4.10.0/./settings/xfdesktop-settings-ui.h 2012-09-13 14:04:52.096149450 +0400 @@ -8,860 +8,1108 @@ static const char xfdesktop_settings_ui[] = #endif { - "\n\n\n \n 127\n -128\n 10\n 1\n " - " 0\n 0\n \n \n 10\n -10\n " - "10\n 0.1000000000000000" - "1\n 0\n 1\n \n \n 192\n 8\n 10\n 1\n 0\n 36\n \n \n 144\n" - " 4\n 10\n 1\n 0\n 12\n \n \n 100\n " - "0\n 10\n 1" - "\n 0\n 40\n \n \n \n \n \n \n \n Auto\n \n \n Centered\n \n \n Tiled\n \n \n" - " Stretched\n \n \n Scaled" - "\n \n \n Zoomed\n \n \n \n \n \n \n \n \n \n Solid color\n \n " - "\n Horizontal gradient\n" - " \n \n V" - "ertical gradient\n \n \n Transparent\n \n \n <" - "/object>\n \n \n \n \n \n " - " \n Left\n " - "\n \n Middle<" - "/col>\n \n \n Right\n \n \n \n \n \n \n \n \n \n None\n \n \n " + "\n\n \n \n \n \n -128\n 127\n <" + "property name=\"step_increment\">1\n 10\n \n \n -10\n" + " 10\n 1\n 0.1000000000000000" + "1\n 10\n \n \n 8\n 192\n 36\n 1\n 10\n \n \n 4\n 144\n 12\n 1\n 10\n \n \n 100\n 40\n 1\n " + "10\n \n \n 1\n 10\n 2\n" + " 1\n 5\n \n \n \n \n \n \n \n" + " \n Auto\n " + " \n \n Cent" + "ered\n \n \n Tiled\n \n \n Stretched\n \n \n " + " Scaled\n \n " + " \n Zoomed\n " + "\n \n \n \n \n \n " + "\n \n \n \n" + " Solid color\n \n \n Horizontal" + " gradient\n \n \n Vertical gradient\n \n \n " + " Transparent\n " + "\n \n \n \n \n \n \n \n \n \n " + " Left\n \n " + "\n Middle\n <" + "/row>\n \n Right\n \n \n \n \n \n \n \n \n \n" + " \n None\n " + " \n \n Shif" + "t\n \n \n Alt\n \n \n Control\n \n \n " + "\n \n \n " + " \n \n" + " \n \n \n Left\n \n \n Middle\n \n \n " + " Right\n \n \n \n \n " + " \n \n \n \n \n \n None\n \n \n " " Shift\n \n " - " \n Alt\n " - "\n \n Control" - "\n \n \n \n \n \n \n \n \n \n Left\n \n \n Middle\n \n \n" - " Right\n \n " - " \n \n \n \n \n \n" - " \n \n Non" - "e\n \n \n Shift\n \n \n Alt\n \n \n Control\n \n \n" - " \n \n \n \n \n \n" + " \n Alt\n \n \n Control\n \n \n \n \n \n \n \n \n \n" " \n None\n " " \n \n Mini" "mized application icons\n \n \n File/launcher icons\n \n" " \n \n \n GDK_POINTER_MOTION_MASK | G" - "DK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEAS" - "E_MASK\n De" - "sktop\n GTK_WIN_POS_CE" - "NTER_ON_PARENT\n preferences" - "-desktop-wallpaper\n GDK_WIN" - "DOW_TYPE_HINT_DIALOG\n F" - "alse\n S" - "et desktop background and menu and icon behavior\n \n \n True\n <" - "property name=\"events\">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_H" - "INT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n" - " 2\n \n " - " \n True\n \n " - " \n " - " True\n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G" - "DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " 6\n \n \n True\n" + "fs_dialog\">\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HI" + "NT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " Desktop\n " + " center-on-parent\n <" + "property name=\"icon_name\">preferences-desktop-wallpaper\n " + " dialog\n Set desktop background and menu and ico" + "n behavior\n \n \n True\n False\n GDK_POINTER_MOTION_MASK | GDK" + "_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_" + "MASK\n 2\n " + " \n \n True\n Fal" + "se\n GDK_POINTER_MOTION" + "_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTT" + "ON_RELEASE_MASK\n \n \n gtk-help\n False\n True\n True<" + "/property>\n True\n GDK_POINTER_MOTION_" + "MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO" + "N_RELEASE_MASK\n True\n \n \n " + " False\n " + " False\n 0\n \n \n \n \n gtk-close\n False" + "\n True" + "\n True\n " + " True\n " + " GDK_POINTER_MOTION_MASK | GDK_POINTER_" + "MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n True\n " + " \n \n False\n False\n 1<" + "/property>\n \n \n <" + "/object>\n \n Fa" + "lse\n True\n " + " end\n 0\n \n \n \n \n True\n " + " False\n <" + "child>\n \n True\n " " True\n " - " False\n " - " False\n " - " \n \n " - " \n \n " - " \n \n \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BU" - "TTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " _Background" - "\n True\n" - " \n \n " - " False\n " - "\n \n \n " - " \n " - "True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOT" + "ION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n 6\n " + " \n \n " + "True\n True<" + "/property>\n False\n False\n \n \n " + " \n \n True\n False\n GDK_POINTER_MOTION_" + "MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO" + "N_RELEASE_MASK\n _Background\n True\n \n \n False\n \n " + " \n \n \n True\n Fals" + "e\n GDK_POINTER" + "_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G" + "DK_BUTTON_RELEASE_MASK\n 12\n 6\n \n " + "\n True\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MA" "SK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " 12\n " - " 6\n " - "\n \n True\n" - " GDK_POINTER_MOTION_MA" - "SK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_" - "RELEASE_MASK\n 0\n GTK_SHADOW_NONE\n \n " - " \n True\n GDK_POINTER_M" - "OTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK" - "_BUTTON_RELEASE_MASK\n 6\n 6\n \n \n True\n GDK" - "_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" - "MASK | GDK_BUTTON_RELEASE_MASK\n " - " 6\n " - " \n \n " - " True\n " + " 0\n " + " none\n " + " \n \n True\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_" + "MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " 6\n " + " 6" + "\n \n \n " + "True\n " + " False\n " + " GDK_POINTER_MOTION_MASK | GDK_PO" + "INTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MAS" + "K\n 6\n \n " + " \n Show applications menu on _desktop right click\n False\n <" + "property name=\"visible\">True\n " " True\n " - " GDK_POINTER_MOTION" - "_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTT" - "ON_RELEASE_MASK\n Show applications menu on _deskt" - "op right click\n True\n " + " False" + "\n GDK_POI" + "NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK" + " | GDK_BUTTON_RELEASE_MASK\n " + " True\n " " True\n " - " True\n " - " \n " - " \n \n " - " \n" - " True\n " - "GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRE" - "SS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " True\n \n " + " \n True\n <" + "property name=\"fill\">True\n " + " 0\n " + " \n \n " + " \n \n " + " True\n " + " False\n GDK_P" + "OINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MA" + "SK | GDK_BUTTON_RELEASE_MASK\n " " 6\n " - " 12\n" + " 12\n " " \n " " \n " " True\n " - " GDK_POINT" - "ER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |" - " GDK_BUTTON_RELEASE_MASK\n " + " False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" + "ESS_MASK | GDK_BUTTON_RELEASE_MASK\n " " 6\n " - " \n \n " - " GDK_POINTER_MOTION_MASK | GDK_POIN" - "TER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK<" - "/property>\n 12\n " - "\n \n " - " True\n " - " GDK_POINTER_MOTION_" - "MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO" - "N_RELEASE_MASK\n " - " _Button:\n" - " True\n " - " combobox1\n " - " \n " - " \n " - " False\n " - " \n " - " \n \n \n " - " True\n " - " GDK_POINTER_MOTIO" - "N_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUT" - "TON_RELEASE_MASK\n " - " model3\n " - " \n " - " " - "\n \n " - " 0\n \n \n " + " \n " + " \n " + " False\n " + " GDK_" + "POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_M" + "ASK | GDK_BUTTON_RELEASE_MASK\n " + " 12\n " + " \n " + " \n " + " True\n False\n " + " GDK_POINTER_MOTION_MASK | GDK_POINTE" + "R_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n _Button:\n " + " True\n combobox1\n " " \n " - " \n " - " False\n " - " 1\n \n " + " \n False\n " + " True\n " + " 0\n \n " " \n " " \n " - " \n " + " \n " " True\n" - " GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_" - "PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " Mo_difier:\n " + " False\n " + " GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION" + "_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK" + "\n model3\n " + "\n \n " + " \n " + " 0\n " + " \n " + " \n " + " \n " + " \n False\n " + " True\n " + " 1\n" + " \n " + " \n " + " \n \n " + " True\n " + " Fa" + "lse\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MA" + "SK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " Mo_difier:\n " " True\n " - " combobox" - "2\n \n" - " \n " - " False\n 2\n " - "\n \n " - " \n " - " \n" - " True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HI" - "NT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " model4\n \n \n " + " combobox2\n " + " \n " + "\n False\n " + "True\n " + " 2\n " + " \n " + " \n " + " \n \n " + " True\n " + " False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G" + "DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " model4\n \n " + " \n " " \n " " 0\n " " \n " " \n " - " \n \n False\n " + " \n \n " + " False\n True\n " " 3\n " " \n " - " \n \n" - " \n " - " \n <" - "object class=\"GtkCheckButton\" id=\"chk_menu_show_app_icons\">\n " - " True\n True\n " - " GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTIO" - "N_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n Show _application icons in menu\n " - " True\n True\n " - " True\n " - " \n " - " \n 1\n " + " \n \n \n " + " True\n True\n 0\n " " \n \n " " \n " - " \n " + " \n Show _application icons in menu\n False\n " + " True\n " + " True\n" + " False\n " + "GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_" + "HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n" + " True\n True\n " + " True\n " + " \n " + " \n " + "True\n " + " True\n " + " 1\n" + " \n " + " \n " + " \n \n False\n " + " GDK_POINTER_MOTION_MASK | GD" + "K_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE" + "_MASK\n 12\n " + " \n \n " + " _Edit desktop" + " menu\n False\n " + " True\n True\n " + " True\n " " GDK_POINTER" "_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G" "DK_BUTTON_RELEASE_MASK\n " - " 12\n " - " \n " - " \n " - " True" - "\n True\n " - " True\n " - " GDK_POINTER_M" - "OTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK" - "_BUTTON_RELEASE_MASK\n " - " _Edit desktop m" - "enu\n True\n " - " \n " - " \n False\n " - " \n \n \n " + " True\n " + " \n " " \n " - " 2\n " + " False\n " + " True" + "\n 0\n \n \n " + " \n " + " \n <" + "property name=\"expand\">True\n " + " True\n " + " 2\n" " \n " - " \n \n " " \n " - " \n \n " - " 1\n " - " \n " - " \n \n " - " \n \n " - " \n \n " - " \n " - " True\n " - " GDK_POINTER_MOTION" - "_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTT" - "ON_RELEASE_MASK\n <b>Desktop Menu</b>\n True\n \n \n \n \n False\n" - " \n \n " - " \n \n True" - "\n GDK_POIN" - "TER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK " - "| GDK_BUTTON_RELEASE_MASK\n 0\n GTK_SHADOW_NONE\n " - " \n \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" - "ESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " 6\n " - " 6\n " - " \n \n True\n \n \n " + " \n \n True" + "\n True\n 1\n \n" + " \n " + " \n \n " + " \n \n " + " \n \n True\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G" + "DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " <b>" + "Desktop Menu</b>\n True\n \n \n \n" + " \n False\n True\n 0\n \n " + " \n \n \n True\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK" "_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " 6\n " - " \n \n " - " True\n " - " True\n GDK_" - "POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_M" - "ASK | GDK_BUTTON_RELEASE_MASK\n " - " Show _window list " - "menu on desktop middle click\n " - " True\n " + " 0\n " + " none\n " + " \n \n True\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G" + "DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " 6\n " + " 6\n " + " \n \n True\n False\n " + " GDK_POINTER_MOTION_MASK | GDK_POINTER_MO" + "TION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n 6\n \n " + " \n Show _window list menu on desktop middle click\n False\n True\n " + " True\n " + " False\n " + " GDK_POINTER_M" + "OTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK" + "_BUTTON_RELEASE_MASK\n True\n " " True\n " - " True\n \n " - " \n \n " - " \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MAS" - "K | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " 6\n 12\n \n " - " \n" - " True" - "\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BU" - "TTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " True\n" + " \n " + " \n True\n True\n 0\n " + " \n \n " + " \n \n " + " True\n " + " False\n " + " GDK_POINTE" + "R_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | " + "GDK_BUTTON_RELEASE_MASK\n " + " 6\n " + " 12\n " + " \n " + " \n " + " True\n " + " False" + "\n GDK" + "_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" + "MASK | GDK_BUTTON_RELEASE_MASK\n " " 6\n " " \n " " \n " - " GDK_POINTER_MOTIO" - "N_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUT" - "TON_RELEASE_MASK\n " + " False\n " + " GDK_POIN" + "TER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK " + "| GDK_BUTTON_RELEASE_MASK\n " " 12\n " " \n " " \n " - " True\n " - " GD" - "K_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS" - "_MASK | GDK_BUTTON_RELEASE_MASK\n " - " B_ut" - "ton:\n True\n " - " combobox8\n \n " - " \n " - " False\n" + " True\n False\n " + " GDK_POINTER_MOTION_MASK | GDK_POINTER_MO" + "TION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n B_utton:\n " + " True\n combobox8\n " + " \n " + " \n False\n " + " True\n " + " 0\n " " \n " " \n " - " \n \n " + " \n \n " " True\n " - " " - "GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRE" - "SS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " model5\n " - " \n " - " \n \n 0\n " + " False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT" + "_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " m" + "odel5\n \n \n " + " \n " + " 0\n " " \n " - " \n \n" - " \n " - " False\n 1\n " - "\n \n " - " \n " - " \n " - " " - "True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_M" - "ASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " Modi_fier:\n " + " \n " + " \n \n False\n " + " True\n " + " 1\n " + " \n " + " \n " + " \n \n " + " True\n " + " False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | " + "GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " Modi_fier:\n " " True\n " - " combobox9\n " - " \n \n False\n " + " combobox9\n " + "\n \n " + " " + "False\n True\n " " 2\n " " \n " - " \n \n " - " \n True\n " - " GDK_POINTER_MOTION_MASK | GD" - "K_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE" - "_MASK\n model6\n " - " \n " - " \n " + " \n \n \n " + " True\n " + " False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BU" + "TTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " model6\n \n " + " \n " " \n " - " 0\n \n " - " \n " - " \n " - " \n " - " False\n " + " 0\n " + " \n " + " \n \n \n " + " Fal" + "se\n True\n " " 3\n " " \n " - " \n " - " \n \n" + " \n \n \n " + " True" + "\n T" + "rue\n 0\n " + " \n \n " " \n " - " \n True\n " + " \n Sh_ow application icons in menu" + "\n False\n " + " True\n " " True\n " - " GDK_POINTER_MOTION" - "_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTT" - "ON_RELEASE_MASK\n " - " Sh_ow application icons " - "in menu\n True\n " - " True\n " - " True<" - "/property>\n \n " + " False\n <" + "property name=\"events\">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_H" + "INT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n" + " True\n True\n " + " True\n " + " \n " " \n " - " 1\n " + "True\n " + " True\n " + " 1\n" " \n " - " \n " - "\n \n " - " True\n " - " True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" - "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " S" - "how workspace _names in list\n " - " True\n " - " True\n True\n " - " \n \n " - " 2<" - "/property>\n \n " " \n " - " \n \n " - " True\n \n " + " Sh" + "ow workspace _names in list\n " + " False\n" + " " + "True\n True\n " + " False\n " + " GDK_POINT" + "ER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |" + " GDK_BUTTON_RELEASE_MASK\n " + " True\n " + " True\n True\n " + "\n \n " + " True\n True\n 2\n " + " \n \n" + " \n " + " \n True\n " + " False\n " + " GDK_POINTER_MOTION_M" + "ASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON" + "_RELEASE_MASK\n <" + "property name=\"left_padding\">12\n " + " \n " + " \n Use _submenus for the windows in each workspa" + "ce\n False\n " + " True\n" + " True\n " + "False\n " + " GDK_POINTER_MO" + "TION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_" + "BUTTON_RELEASE_MASK\n " + " True\n " + " T" + "rue\n " + "\n \n " + " \n " + " \n True\n " + " True\n " + " 3\n " + " \n " + " \n \n \n " + " Show " + "s_ticky windows only in active workspace\n " + " Fals" + "e\n True\n " + " True\n " + " False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " 12\n" - " \n " - " \n " - " True\n " - " True\n" - " GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_" - "PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " Use _submenus for the windows in each workspace\n " - " " - "True\n True\n " + " True\n True\n \n \n " + " True\n True\n 4\n " + " \n \n " " \n " " \n \n " " \n " - " 3\n " - " \n " - " \n \n \n " + " True\n " + " True\n " + " 1\n " + " \n \n \n " + " \n \n " + " \n \n " + " \n " " True\n " - " True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B" - "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " Show s_ticky windows only in active workspace\n " - " True" - "\n True\n " - " \n \n" - " 4\n \n " - " \n " - " \n \n" - " \n " - " \n 1\n \n" - " \n " - " \n \n " - " \n \n " - " \n \n True\n False\n " + " GDK_POINTER_MOTION_M" + "ASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON" + "_RELEASE_MASK\n <b>Window List Menu</b>\n True\n \n " + "\n \n \n False" + "\n True\n " + " 1\n " + " \n \n " + " \n \n 1\n \n " + " \n \n " + " \n True\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B" "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " <b>Wind" - "ow List Menu</b>\n True\n \n \n \n" - " \n False\n 1\n \n " - " \n \n " - "\n \n \n True\n GD" - "K_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS" - "_MASK | GDK_BUTTON_RELEASE_MASK\n _Menus\n " + " _Menus\n " " True\n " - " \n \n 1\n False\n \n " - " \n \n \n True\n GDK_P" - "OINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MA" - "SK | GDK_BUTTON_RELEASE_MASK\n 12\n 6\n \n " + " \n \n " + " 1\n False\n \n" + " \n \n \n True\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_" + "PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n 12\n 6\n \n " " \n " " True\n " - "GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_" - "HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n" - " 0\n " - " GTK_SHADOW_NONE\n \n <" - "object class=\"GtkAlignment\" id=\"alignment11\">\n " + " False\n " + " GDK_POINTER_MOTION_MASK | GDK_POINTER" + "_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n 0\n none\n \n \n " " True\n " - " GDK_POINTER_MOTION_MASK | GDK_POINTE" - "R_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n 6" - "\n 6\n \n " + " False\n " + " GDK_POINTER_MOTION_MASK | GDK_POIN" + "TER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK<" + "/property>\n 6\n 6\n \n " " \n " " True\n " - " GDK_POINTER_MOTION_MASK | G" - "DK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEAS" - "E_MASK\n 6\n \n " - " \n " - " True\n GDK_P" - "OINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MA" - "SK | GDK_BUTTON_RELEASE_MASK\n " - " 12\n " - " \n \n " - " True\n " - " GDK_POINTER_MOTION_MASK | GDK_" - "POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_M" - "ASK\n Icon _type:\n " - " True\n \n " - " \n <" - "property name=\"expand\">False\n " - " \n \n " + " False\n " + " GDK_POINTER_MOTI" + "ON_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BU" + "TTON_RELEASE_MASK\n 6\n " + "\n \n Tr" + "ue\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MAS" + "K | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " 12\n" " \n " - " \n " - " True" - "\n GDK" - "_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" - "MASK | GDK_BUTTON_RELEASE_MASK\n " + " \n " + " True\n " + " Fals" + "e\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B" + "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " I" + "con _type:\n True\n " + " \n \n " + " False\n True\n 0\n <" + "/packing>\n \n " + " \n \n " + " True\n " + " False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" + "ESS_MASK | GDK_BUTTON_RELEASE_MASK\n " " model7\n " " \n " " \n " " \n " " 0\n " " \n " - " \n \n \n " - " False\n " - " 1\n \n " - " \n \n \n " + " \n \n \n " " False\n " - " \n \n \n " - " \n " - " True\n " - " GDK_POINTER_MOTION_MA" - "SK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_" - "RELEASE_MASK\n 12\n \n \n True\n <" - "property name=\"events\">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_H" - "INT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n" - " Icon _size:\n " - " True\n " - " \n " - " \n False\n \n \n " - " \n \n " + " True\n 1\n \n " + " \n " + " \n \n " + " False" + "\n True\n 0\n \n " + " \n " + "\n \n Tr" + "ue\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MAS" + "K | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " 12\n" + " \n " + " \n " " True\n " - " True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PR" - "ESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " Fals" + "e\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B" + "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " I" + "con _size:\n True\n " + " \n \n " + " False\n True\n 0\n <" + "/packing>\n \n " + " \n \n " + " True\n " + " True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTT" + "ON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " False<" + "/property>\n False\n " + " True" + "\n True\n " " adjustment3\n " " \n " - " \n False\n " + "\n False\n True\n " " 1\n " - " \n \n \n " - " \n False\n 1\n " " \n \n " - " \n \n " - " True\n " - " True<" - "/property>\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUT" - "TON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " Sho" - "w t_humbnails\n Select this option to d" - "isplay preview-able files on the desktop as automatically generated thu" - "mbnail icons.\n True\n " - " True\n " " \n " - " \n \n " - " \n Tr" - "ue\n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK" - " | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " Single _click to activate items\n " - " True\n " - " True\n \n " - " \n \n " - " \n " - " True\n GDK" - "_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" - "MASK | GDK_BUTTON_RELEASE_MASK\n " - " 4\n " + " \n False\n True\n 1\n " + " \n \n " " \n \n " + "ass=\"GtkCheckButton\" id=\"chk_show_thumbnails\">\n " + " Show t_h" + "umbnails\n False\n " " True\n " - " True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" - "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " Use c" - "ustom _font size:\n <" - "property name=\"use_underline\">True\n " - " True\n " - " \n " - " \n False\n " + " True\n " + " False" + "\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON" + "_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " Sel" + "ect this option to display preview-able files on the desktop as automat" + "ically generated thumbnail icons.\n " + " True\n " + " True\n \n " + " \n True\n True\n " + " 2\n " " \n \n " - " \n " - " \n " - " True" - "\n " - "False\n True\n " - " GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTIO" - "N_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n adjustment4\n \n \n " - " False\n " - " 1\n \n " - " \n \n \n " + " \n \n " + " True\n " + " False\n " + " GDK_POINTER_MOTION_MAS" + "K | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_R" + "ELEASE_MASK\n 4\n \n \n " + " Use custom _font size:" + "\n False\n " + " True\n " + " True\n " + " False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK " + "| GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " True\n True\n \n \n " " False\n " - " 2\n " - " \n " - " \n \n " + " True\n 0\n \n " + " \n " + " \n \n " + " True\n " + " False\n" + " Tr" + "ue\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B" + "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " Fal" + "se\n False\n " + " True\n True\n " + " adjustment4\n " + " \n " + " \n False\n True\n " + " 1\n " + " \n \n" + " \n " + " \n False\n True\n 2\n " + " \n \n " + " \n \n " + " Single _cli" + "ck to activate items\n False\n " + " True\n " + " True\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK " + "| GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " True\n True\n \n " + " \n " + " True\n " + " True\n " + " 3\n " + " \n \n \n " " \n " + " False\n " + " GDK_POINTER_MO" + "TION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_" + "BUTTON_RELEASE_MASK\n 12\n " + " \n \n True\n " + " False\n " " GDK_POINTER_MOTION_MASK" " | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RE" - "LEASE_MASK\n 12\n \n \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT" - "_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " Label trans_parency:\n " + "LEASE_MASK\n Label trans_parency:\n" + " True\n \n " + " \n " + " False\n " + " True\n " + " 0\n \n " + " \n \n \n True\n " + "True\n " + " GDK_POINTER_MOTION_MASK | GDK_" + "POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_M" + "ASK\n Specify the transparency level fo" + "r the rounded label drawn behind the icon text\n " + " adjustment5\n 0\n right\n " + " \n \n " + " True\n Tru" + "e\n 1\n \n \n " + " \n \n " + " True\n True<" + "/property>\n 3\n \n " + " \n \n \n True\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_" + "MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " 12\n \n " + " \n " + " True\n" + " Fa" + "lse\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK" + "_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " Number of lines in label:\n " " True\n " " \n " - " \n False\n " - "\n \n " - " \n <" - "object class=\"GtkHScale\" id=\"hscale3\">\n " - " True\n " - " True\n" - " GDK_P" - "OINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MA" - "SK | GDK_BUTTON_RELEASE_MASK\n " - " Specify " - "the transparency level for the rounded label drawn behind the icon text" - "\n adjustment5\n " - " 0\n " - " GTK_POS_RIGHT\n " - " \n " - " \n 1\n " - " \n \n " - " \n \n 3\n \n " - " \n " - "\n \n \n \n \n \n " - "True\n " - "GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRE" - "SS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " <b>Appearance<" - ";/b>\n True\n \n " + " \n False\n True\n " + " 0\n " + " \n " + "\n \n " + " \n" + " True" + "\n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HIN" + "T_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " False\n False\n " + " True\n True\n " + " adjustment6\n" + " \n " + " \n False\n " + " True\n " + " 1\n " + " \n " " \n \n " - " \n Fa" - "lse\n \n <" - "/child>\n \n \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BU" - "TTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " 0\n " - " GTK_SHADOW_NONE\n " - " \n \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MAS" - "K | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " 6\n " - " 6\n " - " \n \n " + " \n <" + "property name=\"expand\">False\n " + " True\n " + " 6\n " + " \n " + "\n \n " + "\n \n " + "\n \n " + " \n " + " True\n " + " False\n " + " GDK_POINTER_MOTION_MASK | " + "GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEA" + "SE_MASK\n <b>Appearance</b>\n " + " True\n " + " \n \n " + " \n \n " + " False\n " + " True\n " + " 0\n " + "\n \n \n" + " \n " " True\n " - " True\n " - " GDK_POINTER_MOTI" - "ON_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BU" - "TTON_RELEASE_MASK\n GTK_POLICY_AUTOMATIC\n " - " GTK_POLICY_A" - "UTOMATIC\n GTK_SHADOW_ETCHED_IN\n " - " \n \n " + " False\n " + " GDK_POINTER_MOTION_MASK | GDK_" + "POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_M" + "ASK\n 0\n n" + "one\n \n " + " \n " " True\n " + " False\n " + " GDK_POINTER_MOTION_MASK | G" + "DK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEAS" + "E_MASK\n 6\n 6\n \n " + " \n T" + "rue\n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B" + "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " automatic\n automatic\n etched-in\n \n \n True\n " " True\n " - " GDK_POINTER_MOTION_" - "MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO" - "N_RELEASE_MASK\n False\n " + " GDK_POINTER_MOTION_MASK | GDK" + "_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_" + "MASK\n False\n \n \n " " \n \n " " \n \n " - " \n \n " - " \n " - " \n " - " True\n " - " GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTI" - "ON_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n <b>Default Icons</b>\n " + " \n \n True\n False\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HIN" + "T_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " <b>Default Icons</b>\n " " True\n " " \n \n " - " \n \n " - " 1\n \n \n \n " - " \n \n " - " \n <" - "property name=\"visible\">True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MAS" - "K | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " _Icons\n True\n \n \n " - " 2\n " - " False\n \n \n \n " - " \n \n \n 1\n \n \n \n \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" - "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n \n" - " \n " - " True\n True\n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUT" - "TON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n gtk-help\n True\n \n " - " \n \n \n True\n True\n" - " True\n " - " GDK_POINTER_MOTION_MASK | GDK_P" - "OINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MA" - "SK\n gtk-close\n True\n " - " \n \n 1\n \n " - " \n \n \n False\n GTK_PACK_END\n \n \n \n \n \n button2\n button1\n \n \n\n" + " \n \n True\n True\n 1\n \n " + " \n \n <" + "packing>\n 2\n" + " \n \n " + " \n \n True\n False" + "\n GDK_POINTER_MOTION_MASK" + " | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RE" + "LEASE_MASK\n _Icons\n True\n \n " + " \n " + "2\n False\n \n \n " + " \n \n \n " + " \n True\n " + " True\n 1\n \n \n" + " \n \n \n button2\n button1\n \n \n" + "\n" }; -static const unsigned xfdesktop_settings_ui_length = 58342u; +static const unsigned xfdesktop_settings_ui_length = 75336u; --- ./xfdesktop-4.10.0.orig/./settings/main.c 2012-04-29 00:53:07.000000000 +0400 +++ ./xfdesktop-4.10.0/./settings/main.c 2012-09-13 16:52:54.138729902 +0400 @@ -66,6 +66,7 @@ #define DESKTOP_ICONS_STYLE_PROP "/desktop-icons/style" #define DESKTOP_ICONS_ICON_SIZE_PROP "/desktop-icons/icon-size" +#define DESKTOP_ICONS_LABEL_LINES_PROP "/desktop-icons/label-lines" #define DESKTOP_ICONS_FONT_SIZE_PROP "/desktop-icons/font-size" #define DESKTOP_ICONS_CUSTOM_FONT_SIZE_PROP "/desktop-icons/use-custom-font-size" #define DESKTOP_ICONS_SINGLE_CLICK_PROP "/desktop-icons/single-click" @@ -1294,7 +1295,8 @@ gint i, j, nmonitors, nscreens; GtkWidget *appearance_container, *chk_custom_font_size, *spin_font_size, *color_style_widget, *w, *box, - *spin_icon_size, *chk_show_thumbnails, *chk_single_click; + *spin_icon_size, *chk_show_thumbnails, *chk_single_click, + *spin_label_lines; appearance_container = GTK_WIDGET(gtk_builder_get_object(main_gxml, "notebook_screens")); @@ -1310,6 +1312,8 @@ DESKTOP_ICONS_ICON_SIZE_PROP, DEFAULT_ICON_SIZE)); + spin_label_lines = GTK_WIDGET(gtk_builder_get_object(main_gxml, "spin_label_lines")); + chk_custom_font_size = GTK_WIDGET(gtk_builder_get_object(main_gxml, "chk_custom_font_size")); spin_font_size = GTK_WIDGET(gtk_builder_get_object(main_gxml, "spin_font_size")); @@ -1610,6 +1614,9 @@ xfconf_g_property_bind(channel, DESKTOP_ICONS_FONT_SIZE_PROP, G_TYPE_DOUBLE, G_OBJECT(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(spin_font_size))), "value"); + xfconf_g_property_bind(channel, DESKTOP_ICONS_LABEL_LINES_PROP, G_TYPE_UINT, + G_OBJECT(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(spin_label_lines))), + "value"); xfconf_g_property_bind(channel, DESKTOP_ICONS_CUSTOM_FONT_SIZE_PROP, G_TYPE_BOOLEAN, G_OBJECT(chk_custom_font_size), "active"); --- ./xfdesktop-4.10.0.orig/./settings/xfdesktop-settings-ui.glade 2012-04-29 00:53:07.000000000 +0400 +++ ./xfdesktop-4.10.0/./settings/xfdesktop-settings-ui.glade 2012-09-13 11:26:37.249874787 +0400 @@ -1,48 +1,51 @@ - - + + + + - 127 -128 - 10 + 127 1 - 0 - 0 + 10 - 10 -10 - 10 - 0.10000000000000001 - 0 + 10 1 + 0.10000000000000001 + 10 - 192 8 - 10 - 1 - 0 + 192 36 + 1 + 10 - 144 4 - 10 - 1 - 0 + 144 12 + 1 + 10 100 - 0 + 40 + 1 10 + + + 1 + 10 + 2 1 - 0 - 40 + 5 + @@ -68,6 +71,7 @@ + @@ -87,6 +91,7 @@ + @@ -103,6 +108,7 @@ + @@ -122,6 +128,7 @@ + @@ -138,6 +145,7 @@ + @@ -157,6 +165,7 @@ + @@ -172,21 +181,68 @@ + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Desktop - GTK_WIN_POS_CENTER_ON_PARENT + center-on-parent preferences-desktop-wallpaper - GDK_WINDOW_TYPE_HINT_DIALOG - False + dialog Set desktop background and menu and icon behavior True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + gtk-help + False + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 0 + + + + + gtk-close + False + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 1 + + + + + False + True + end + 0 + + True + False True @@ -199,14 +255,12 @@ True False False - - - True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK _Background True @@ -218,55 +272,70 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 6 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - GTK_SHADOW_NONE + none True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 6 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 + Show applications menu on _desktop right click + False True True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Show applications menu on _desktop right click True True True + + True + True + 0 + True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK _Button: True @@ -274,11 +343,14 @@ False + True + 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK model3 @@ -290,12 +362,14 @@ False + True 1 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Mo_difier: True @@ -303,12 +377,14 @@ False + True 2 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK model4 @@ -320,44 +396,60 @@ False + True 3 + + True + True + 0 + + Show _application icons in menu + False True True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Show _application icons in menu True True True + True + True 1 + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 + _Edit desktop menu + False True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Edit desktop menu True False + True + 0 + True + True 2 @@ -365,6 +457,8 @@ + True + True 1 @@ -375,6 +469,7 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Desktop Menu</b> True @@ -383,54 +478,70 @@ False + True + 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - GTK_SHADOW_NONE + none True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 6 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 + Show _window list menu on desktop middle click + False True True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Show _window list menu on desktop middle click True True True + + True + True + 0 + True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK B_utton: True @@ -438,11 +549,14 @@ False + True + 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK model5 @@ -454,12 +568,14 @@ False + True 1 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Modi_fier: True @@ -467,12 +583,14 @@ False + True 2 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK model6 @@ -484,69 +602,92 @@ False + True 3 + + True + True + 0 + + Sh_ow application icons in menu + False True True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Sh_ow application icons in menu True True True + True + True 1 + Show workspace _names in list + False True True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Show workspace _names in list True True True + True + True 2 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 + Use _submenus for the windows in each workspace + False True True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Use _submenus for the windows in each workspace True True + True + True 3 + Show s_ticky windows only in active workspace + False True True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Show s_ticky windows only in active workspace True True + True + True 4 @@ -554,6 +695,8 @@ + True + True 1 @@ -564,6 +707,7 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Window List Menu</b> True @@ -572,14 +716,19 @@ False + True 1 + + 1 + True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK _Menus True @@ -592,45 +741,54 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 6 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - GTK_SHADOW_NONE + none True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 6 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Icon _type: True False + True + 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK model7 @@ -642,28 +800,35 @@ False + True 1 False + True + 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Icon _size: True False + True + 0 @@ -671,56 +836,64 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + False + True + True adjustment3 False + True 1 False + True 1 - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Show t_humbnails - Select this option to display preview-able files on the desktop as automatically generated thumbnail icons. - True - True - - - - + False True True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Single _click to activate items + Select this option to display preview-able files on the desktop as automatically generated thumbnail icons. True True + + True + True + 2 + True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 4 + Use custom _font size: + False True True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Use custom _font size: True True False + True + 0 @@ -729,32 +902,59 @@ False True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + False + True + True adjustment4 False + True 1 False + True 2 + + Single _click to activate items + False + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + True + True + 3 + + + + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Label trans_parency: True False + True + 0 @@ -762,20 +962,68 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Specify the transparency level for the rounded label drawn behind the icon text + Specify the transparency level for the rounded label drawn behind the icon text adjustment5 0 - GTK_POS_RIGHT + right + True + True 1 + True + True 3 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Number of lines in label: + True + + + False + True + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + False + True + True + adjustment6 + + + False + True + 1 + + + + + False + True + 6 + + @@ -783,6 +1031,7 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Appearance</b> True @@ -791,17 +1040,21 @@ False + True + 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - GTK_SHADOW_NONE + none True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 6 @@ -810,9 +1063,9 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_ETCHED_IN + automatic + automatic + etched-in True @@ -828,6 +1081,7 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Default Icons</b> True @@ -835,14 +1089,20 @@ + True + True 1 + + 2 + True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK _Icons True @@ -856,42 +1116,11 @@ + True + True 1 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-help - True - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-close - True - - - 1 - - - - - False - GTK_PACK_END - - --- ./xfdesktop-4.10.0.orig/./src/xfce-desktop.c 2012-04-29 00:53:05.000000000 +0400 +++ ./xfdesktop-4.10.0/./src/xfce-desktop.c 2012-09-13 16:54:00.368733047 +0400 @@ -107,6 +107,7 @@ gboolean icons_font_size_set; guint icons_font_size; guint icons_size; + guint icons_label_lines; GtkWidget *icon_view; gdouble system_font_size; #endif @@ -126,6 +127,7 @@ #ifdef ENABLE_DESKTOP_ICONS PROP_ICON_STYLE, PROP_ICON_SIZE, + PROP_ICON_LABEL_LINES, PROP_ICON_FONT_SIZE, PROP_ICON_FONT_SIZE_SET, #endif @@ -243,6 +245,8 @@ xfdesktop_icon_view_set_icon_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), desktop->priv->icons_size); } + xfdesktop_icon_view_set_label_lines(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + desktop->priv->icons_label_lines); gtk_widget_show(desktop->priv->icon_view); gtk_container_add(GTK_CONTAINER(desktop), desktop->priv->icon_view); } @@ -645,6 +649,13 @@ 8, 192, 36, XFDESKTOP_PARAM_FLAGS)); + g_object_class_install_property(gobject_class, PROP_ICON_LABEL_LINES, + g_param_spec_uint("icon-label-lines", + "icon label lines", + "icon label lines", + 1, 10, 2, + XFDESKTOP_PARAM_FLAGS)); + g_object_class_install_property(gobject_class, PROP_ICON_FONT_SIZE, g_param_spec_uint("icon-font-size", "icon font size", @@ -710,6 +721,11 @@ g_value_get_uint(value)); break; + case PROP_ICON_LABEL_LINES: + xfce_desktop_set_icon_label_lines(desktop, + g_value_get_uint(value)); + break; + case PROP_ICON_FONT_SIZE: xfce_desktop_set_icon_font_size(desktop, g_value_get_uint(value)); @@ -749,6 +765,10 @@ g_value_set_uint(value, desktop->priv->icons_size); break; + case PROP_ICON_LABEL_LINES: + g_value_set_uint(value, desktop->priv->icons_label_lines); + break; + case PROP_ICON_FONT_SIZE: g_value_set_uint(value, desktop->priv->icons_font_size); break; @@ -1031,6 +1051,8 @@ G_OBJECT(desktop), "icon-style"); xfconf_g_property_bind(channel, ICONS_PREFIX "icon-size", G_TYPE_UINT, G_OBJECT(desktop), "icon-size"); + xfconf_g_property_bind(channel, ICONS_PREFIX "label-lines", G_TYPE_UINT, + G_OBJECT(desktop), "icon-label-lines"); xfconf_g_property_bind(channel, ICONS_PREFIX "font-size", G_TYPE_UINT, G_OBJECT(desktop), "icon-font-size"); xfconf_g_property_bind(channel, ICONS_PREFIX "use-custom-font-size", @@ -1312,6 +1334,25 @@ } #endif } + +void +xfce_desktop_set_icon_label_lines(XfceDesktop *desktop, + guint icon_label_lines) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + +#ifdef ENABLE_DESKTOP_ICONS + if(icon_label_lines == desktop->priv->icons_label_lines) + return; + + desktop->priv->icons_label_lines = icon_label_lines; + + if(desktop->priv->icon_view) { + xfdesktop_icon_view_set_label_lines(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + icon_label_lines); + } +#endif +} void xfce_desktop_set_icon_font_size(XfceDesktop *desktop, --- ./xfdesktop-4.10.0.orig/./src/xfce-desktop.h 2012-04-29 00:53:05.000000000 +0400 +++ ./xfdesktop-4.10.0/./src/xfce-desktop.h 2012-09-13 13:29:04.238989760 +0400 @@ -93,6 +93,9 @@ void xfce_desktop_set_icon_size(XfceDesktop *desktop, guint icon_size); +void xfce_desktop_set_icon_label_lines(XfceDesktop *desktop, + guint icon_label_lines); + void xfce_desktop_set_use_icon_font_size(XfceDesktop *desktop, gboolean use_system); void xfce_desktop_set_icon_font_size(XfceDesktop *desktop, --- ./xfdesktop-4.10.0.orig/./src/xfdesktop-icon-view.c 2012-04-29 00:53:05.000000000 +0400 +++ ./xfdesktop-4.10.0/./src/xfdesktop-icon-view.c 2012-09-13 18:00:18.679934402 +0400 @@ -53,6 +53,7 @@ #include #define DEFAULT_FONT_SIZE 12 +#define DEFAULT_LABEL_LINES 2 #define DEFAULT_ICON_SIZE 32 #define ICON_SIZE (icon_view->priv->icon_size) @@ -107,6 +108,7 @@ guint icon_size; gdouble font_size; + guint label_lines; WnckScreen *wnck_screen; PangoLayout *playout; @@ -654,6 +656,7 @@ icon_view->priv->icon_size = DEFAULT_ICON_SIZE; icon_view->priv->font_size = DEFAULT_FONT_SIZE; + icon_view->priv->label_lines = DEFAULT_LABEL_LINES; icon_view->priv->allow_rubber_banding = TRUE; icon_view->priv->selection_box_alpha = DEFAULT_RUBBERBAND_ALPHA; @@ -2539,6 +2542,8 @@ icon_view->priv->width = width; icon_view->priv->height = height; + // TODO: count the vertical CELL_SIZE according to the number of lines of label + icon_view->priv->nrows = (height - SCREEN_MARGIN * 2) / CELL_SIZE; icon_view->priv->ncols = (width - SCREEN_MARGIN * 2) / CELL_SIZE; @@ -2773,13 +2778,15 @@ pango_layout_get_pixel_extents(playout, NULL, &prect); if(prect.width > TEXT_WIDTH) { // if(icon != icon_view->priv->cursor && icon_view->priv->ellipsize_icon_labels) - if(!g_list_find(icon_view->priv->selected_icons, icon) && icon_view->priv->ellipsize_icon_labels) + pango_layout_set_width(playout, TEXT_WIDTH * PANGO_SCALE); + pango_layout_set_wrap(playout, PANGO_WRAP_WORD_CHAR); + if(!g_list_find(icon_view->priv->selected_icons, icon) && icon_view->priv->ellipsize_icon_labels) { pango_layout_set_ellipsize(playout, PANGO_ELLIPSIZE_END); - else { + pango_layout_set_height(playout, -(icon_view->priv->label_lines)); + } else { pango_layout_set_ellipsize(playout, PANGO_ELLIPSIZE_NONE); pango_layout_set_wrap(playout, PANGO_WRAP_WORD_CHAR); } - pango_layout_set_width(playout, TEXT_WIDTH * PANGO_SCALE); } } @@ -3893,6 +3900,30 @@ return icon_view->priv->parent_window; } +void +xfdesktop_icon_view_set_label_lines(XfdesktopIconView *icon_view, + guint label_lines) +{ + g_return_if_fail(XFDESKTOP_IS_ICON_VIEW(icon_view)); + + if(label_lines == icon_view->priv->label_lines) + return; + + icon_view->priv->label_lines = label_lines; + + if(GTK_WIDGET_REALIZED(icon_view)) { + xfdesktop_grid_do_resize(icon_view); + gtk_widget_queue_draw(GTK_WIDGET(icon_view)); + } +} + +guint +xfdesktop_icon_view_get_label_lines(XfdesktopIconView *icon_view) +{ + g_return_val_if_fail(XFDESKTOP_IS_ICON_VIEW(icon_view), 0); + return icon_view->priv->label_lines; +} + #if defined(DEBUG) && DEBUG > 0 guint _xfdesktop_icon_view_n_items(XfdesktopIconView *icon_view) --- ./xfdesktop-4.10.0.orig/./src/xfdesktop-icon-view.h 2012-04-29 00:53:05.000000000 +0400 +++ ./xfdesktop-4.10.0/./src/xfdesktop-icon-view.h 2012-09-13 09:49:34.327929431 +0400 @@ -116,6 +116,10 @@ gdouble font_size_points); gdouble xfdesktop_icon_view_get_font_size(XfdesktopIconView *icon_view); +void xfdesktop_icon_view_set_label_lines(XfdesktopIconView *icon_view, + guint label_lines); +guint xfdesktop_icon_view_get_label_lines(XfdesktopIconView *icon_view); + GtkWidget *xfdesktop_icon_view_get_window_widget(XfdesktopIconView *icon_view); gboolean