diff options
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index b0dc62f..293247b 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1885,29 +1885,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) { | |||
1885 | 1885 | ||
1886 | menu.insert(tabmenu_label, tab_menu); | 1886 | menu.insert(tabmenu_label, tab_menu); |
1887 | 1887 | ||
1888 | Configmenus::iterator it = m_configmenu_list.begin(); | ||
1889 | Configmenus::iterator it_end = m_configmenu_list.end(); | ||
1890 | for (; it != it_end; ++it) | ||
1891 | menu.insert(it->first, it->second); | ||
1892 | |||
1893 | _BOOLITEM(menu, Configmenu, ImageDithering, | ||
1894 | "Image Dithering", "Image Dithering", | ||
1895 | *resource.image_dither, save_and_reconfigure); | ||
1896 | _BOOLITEM(menu, Configmenu, OpaqueMove, | ||
1897 | "Opaque Window Moving", | ||
1898 | "Window Moving with whole window visible (as opposed to outline moving)", | ||
1899 | *resource.opaque_move, saverc_cmd); | ||
1900 | _BOOLITEM(menu, Configmenu, WorkspaceWarping, | ||
1901 | "Workspace Warping", | ||
1902 | "Workspace Warping - dragging windows to the edge and onto the next workspace", | ||
1903 | *resource.workspace_warping, saverc_cmd); | ||
1904 | _BOOLITEM(menu, Configmenu, DecorateTransient, | ||
1905 | "Decorate Transient Windows", "Decorate Transient Windows", | ||
1906 | *resource.decorate_transient, saverc_cmd); | ||
1907 | _BOOLITEM(menu, Configmenu, ClickRaises, | ||
1908 | "Click Raises", "Click Raises", | ||
1909 | *resource.click_raises, saverc_cmd); | ||
1910 | |||
1911 | #ifdef HAVE_XRENDER | 1888 | #ifdef HAVE_XRENDER |
1912 | if (FbTk::Transparent::haveRender() || | 1889 | if (FbTk::Transparent::haveRender() || |
1913 | FbTk::Transparent::haveComposite()) { | 1890 | FbTk::Transparent::haveComposite()) { |
@@ -1958,6 +1935,30 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) { | |||
1958 | menu.insert(alphamenu_label, alpha_menu); | 1935 | menu.insert(alphamenu_label, alpha_menu); |
1959 | } | 1936 | } |
1960 | #endif // HAVE_XRENDER | 1937 | #endif // HAVE_XRENDER |
1938 | |||
1939 | Configmenus::iterator it = m_configmenu_list.begin(); | ||
1940 | Configmenus::iterator it_end = m_configmenu_list.end(); | ||
1941 | for (; it != it_end; ++it) | ||
1942 | menu.insert(it->first, it->second); | ||
1943 | |||
1944 | _BOOLITEM(menu, Configmenu, ImageDithering, | ||
1945 | "Image Dithering", "Image Dithering", | ||
1946 | *resource.image_dither, save_and_reconfigure); | ||
1947 | _BOOLITEM(menu, Configmenu, OpaqueMove, | ||
1948 | "Opaque Window Moving", | ||
1949 | "Window Moving with whole window visible (as opposed to outline moving)", | ||
1950 | *resource.opaque_move, saverc_cmd); | ||
1951 | _BOOLITEM(menu, Configmenu, WorkspaceWarping, | ||
1952 | "Workspace Warping", | ||
1953 | "Workspace Warping - dragging windows to the edge and onto the next workspace", | ||
1954 | *resource.workspace_warping, saverc_cmd); | ||
1955 | _BOOLITEM(menu, Configmenu, DecorateTransient, | ||
1956 | "Decorate Transient Windows", "Decorate Transient Windows", | ||
1957 | *resource.decorate_transient, saverc_cmd); | ||
1958 | _BOOLITEM(menu, Configmenu, ClickRaises, | ||
1959 | "Click Raises", "Click Raises", | ||
1960 | *resource.click_raises, saverc_cmd); | ||
1961 | |||
1961 | #undef _BOOLITEM | 1962 | #undef _BOOLITEM |
1962 | 1963 | ||
1963 | // finaly update menu | 1964 | // finaly update menu |