diff options
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 18da436..7648f78 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1805,41 +1805,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) { | |||
1805 | 1805 | ||
1806 | menu.insert(tabmenu_label, tab_menu); | 1806 | menu.insert(tabmenu_label, tab_menu); |
1807 | 1807 | ||
1808 | Configmenus::iterator it = m_configmenu_list.begin(); | ||
1809 | Configmenus::iterator it_end = m_configmenu_list.end(); | ||
1810 | for (; it != it_end; ++it) | ||
1811 | menu.insert(it->first, it->second); | ||
1812 | |||
1813 | _BOOLITEM(menu, Configmenu, ImageDithering, | ||
1814 | "Image Dithering", "Image Dithering", | ||
1815 | *resource.image_dither, save_and_reconfigure); | ||
1816 | _BOOLITEM(menu, Configmenu, OpaqueMove, | ||
1817 | "Opaque Window Moving", | ||
1818 | "Window Moving with whole window visible (as opposed to outline moving)", | ||
1819 | *resource.opaque_move, saverc_cmd); | ||
1820 | _BOOLITEM(menu, Configmenu, FullMax, | ||
1821 | "Full Maximization", "Maximise over slit, toolbar, etc", | ||
1822 | *resource.full_max, saverc_cmd); | ||
1823 | try { | ||
1824 | _BOOLITEM(menu, Configmenu, FocusNew, | ||
1825 | "Focus New Windows", "Focus newly created windows", | ||
1826 | *m_resource_manager.getResource<bool>(name() + ".focusNewWindows"), | ||
1827 | saverc_cmd); | ||
1828 | } catch (FbTk::ResourceException e) { | ||
1829 | cerr<<e.what()<<endl; | ||
1830 | } | ||
1831 | |||
1832 | _BOOLITEM(menu, Configmenu, WorkspaceWarping, | ||
1833 | "Workspace Warping", | ||
1834 | "Workspace Warping - dragging windows to the edge and onto the next workspace", | ||
1835 | *resource.workspace_warping, saverc_cmd); | ||
1836 | _BOOLITEM(menu, Configmenu, DecorateTransient, | ||
1837 | "Decorate Transient Windows", "Decorate Transient Windows", | ||
1838 | *resource.decorate_transient, saverc_cmd); | ||
1839 | _BOOLITEM(menu, Configmenu, ClickRaises, | ||
1840 | "Click Raises", "Click Raises", | ||
1841 | *resource.click_raises, saverc_cmd); | ||
1842 | |||
1843 | #ifdef HAVE_XRENDER | 1808 | #ifdef HAVE_XRENDER |
1844 | if (FbTk::Transparent::haveRender() || | 1809 | if (FbTk::Transparent::haveRender() || |
1845 | FbTk::Transparent::haveComposite()) { | 1810 | FbTk::Transparent::haveComposite()) { |
@@ -1890,6 +1855,42 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) { | |||
1890 | menu.insert(alphamenu_label, alpha_menu); | 1855 | menu.insert(alphamenu_label, alpha_menu); |
1891 | } | 1856 | } |
1892 | #endif // HAVE_XRENDER | 1857 | #endif // HAVE_XRENDER |
1858 | |||
1859 | Configmenus::iterator it = m_configmenu_list.begin(); | ||
1860 | Configmenus::iterator it_end = m_configmenu_list.end(); | ||
1861 | for (; it != it_end; ++it) | ||
1862 | menu.insert(it->first, it->second); | ||
1863 | |||
1864 | _BOOLITEM(menu, Configmenu, ImageDithering, | ||
1865 | "Image Dithering", "Image Dithering", | ||
1866 | *resource.image_dither, save_and_reconfigure); | ||
1867 | _BOOLITEM(menu, Configmenu, OpaqueMove, | ||
1868 | "Opaque Window Moving", | ||
1869 | "Window Moving with whole window visible (as opposed to outline moving)", | ||
1870 | *resource.opaque_move, saverc_cmd); | ||
1871 | _BOOLITEM(menu, Configmenu, FullMax, | ||
1872 | "Full Maximization", "Maximise over slit, toolbar, etc", | ||
1873 | *resource.full_max, saverc_cmd); | ||
1874 | try { | ||
1875 | _BOOLITEM(menu, Configmenu, FocusNew, | ||
1876 | "Focus New Windows", "Focus newly created windows", | ||
1877 | *m_resource_manager.getResource<bool>(name() + ".focusNewWindows"), | ||
1878 | saverc_cmd); | ||
1879 | } catch (FbTk::ResourceException e) { | ||
1880 | cerr<<e.what()<<endl; | ||
1881 | } | ||
1882 | |||
1883 | _BOOLITEM(menu, Configmenu, WorkspaceWarping, | ||
1884 | "Workspace Warping", | ||
1885 | "Workspace Warping - dragging windows to the edge and onto the next workspace", | ||
1886 | *resource.workspace_warping, saverc_cmd); | ||
1887 | _BOOLITEM(menu, Configmenu, DecorateTransient, | ||
1888 | "Decorate Transient Windows", "Decorate Transient Windows", | ||
1889 | *resource.decorate_transient, saverc_cmd); | ||
1890 | _BOOLITEM(menu, Configmenu, ClickRaises, | ||
1891 | "Click Raises", "Click Raises", | ||
1892 | *resource.click_raises, saverc_cmd); | ||
1893 | |||
1893 | #undef _BOOLITEM | 1894 | #undef _BOOLITEM |
1894 | 1895 | ||
1895 | // finaly update menu | 1896 | // finaly update menu |