diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Screen.cc | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 3ecb077..70f0657 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| 23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
| 24 | 24 | ||
| 25 | // $Id: Screen.cc,v 1.179 2003/06/08 13:47:30 rathnor Exp $ | 25 | // $Id: Screen.cc,v 1.180 2003/06/11 00:51:07 fluxgen Exp $ |
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
| @@ -2207,48 +2207,38 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) { | |||
| 2207 | menu.insert("Slit", &slit()->menu()); | 2207 | menu.insert("Slit", &slit()->menu()); |
| 2208 | } | 2208 | } |
| 2209 | #endif // SLIT | 2209 | #endif // SLIT |
| 2210 | menu.insert(i18n->getMessage( | 2210 | menu.insert(i18n->getMessage(ToolbarSet, ToolbarToolbarTitle, |
| 2211 | ToolbarSet, ToolbarToolbarTitle, | ||
| 2212 | "Toolbar"), &m_toolbarhandler->getToolbarMenu()); | 2211 | "Toolbar"), &m_toolbarhandler->getToolbarMenu()); |
| 2213 | menu.insert(new | 2212 | menu.insert(new |
| 2214 | BoolMenuItem(i18n->getMessage( | 2213 | BoolMenuItem(i18n->getMessage(ConfigmenuSet, ConfigmenuImageDithering, |
| 2215 | ConfigmenuSet, ConfigmenuImageDithering, | ||
| 2216 | "Image Dithering"), | 2214 | "Image Dithering"), |
| 2217 | *resource.image_dither, save_and_reconfigure)); | 2215 | *resource.image_dither, save_and_reconfigure)); |
| 2218 | menu.insert(new | 2216 | menu.insert(new |
| 2219 | BoolMenuItem( | 2217 | BoolMenuItem(i18n->getMessage(ConfigmenuSet, ConfigmenuOpaqueMove, |
| 2220 | i18n->getMessage( | ||
| 2221 | ConfigmenuSet, ConfigmenuOpaqueMove, | ||
| 2222 | "Opaque Window Moving"), | 2218 | "Opaque Window Moving"), |
| 2223 | *resource.opaque_move, saverc_cmd)); | 2219 | *resource.opaque_move, saverc_cmd)); |
| 2224 | menu.insert(new | 2220 | menu.insert(new |
| 2225 | BoolMenuItem(i18n->getMessage( | 2221 | BoolMenuItem(i18n->getMessage(ConfigmenuSet, ConfigmenuFullMax, |
| 2226 | ConfigmenuSet, ConfigmenuFullMax, | ||
| 2227 | "Full Maximization"), | 2222 | "Full Maximization"), |
| 2228 | *resource.full_max, saverc_cmd)); | 2223 | *resource.full_max, saverc_cmd)); |
| 2229 | menu.insert(new | 2224 | menu.insert(new |
| 2230 | BoolMenuItem(i18n->getMessage( | 2225 | BoolMenuItem(i18n->getMessage(ConfigmenuSet, ConfigmenuFocusNew, |
| 2231 | ConfigmenuSet, ConfigmenuFocusNew, | ||
| 2232 | "Focus New Windows"), | 2226 | "Focus New Windows"), |
| 2233 | *resource.focus_new, saverc_cmd)); | 2227 | *resource.focus_new, saverc_cmd)); |
| 2234 | menu.insert(new | 2228 | menu.insert(new |
| 2235 | BoolMenuItem(i18n->getMessage( | 2229 | BoolMenuItem(i18n->getMessage(ConfigmenuSet, ConfigmenuFocusLast, |
| 2236 | ConfigmenuSet, ConfigmenuFocusLast, | ||
| 2237 | "Focus Last Window on Workspace"), | 2230 | "Focus Last Window on Workspace"), |
| 2238 | *resource.focus_last, saverc_cmd)); | 2231 | *resource.focus_last, saverc_cmd)); |
| 2239 | menu.insert(new | 2232 | menu.insert(new |
| 2240 | BoolMenuItem(i18n->getMessage( | 2233 | BoolMenuItem(i18n->getMessage(ConfigmenuSet, ConfigmenuMaxOverSlit, |
| 2241 | ConfigmenuSet, ConfigmenuMaxOverSlit, | ||
| 2242 | "Maximize Over Slit"), | 2234 | "Maximize Over Slit"), |
| 2243 | *resource.max_over_slit, saverc_cmd)); | 2235 | *resource.max_over_slit, saverc_cmd)); |
| 2244 | menu.insert(new | 2236 | menu.insert(new |
| 2245 | BoolMenuItem(i18n->getMessage( | 2237 | BoolMenuItem(i18n->getMessage(ConfigmenuSet, ConfigmenuWorkspaceWarping, |
| 2246 | ConfigmenuSet, ConfigmenuWorkspaceWarping, | ||
| 2247 | "Workspace Warping"), | 2238 | "Workspace Warping"), |
| 2248 | *resource.workspace_warping, saverc_cmd)); | 2239 | *resource.workspace_warping, saverc_cmd)); |
| 2249 | menu.insert(new | 2240 | menu.insert(new |
| 2250 | BoolMenuItem(i18n->getMessage( | 2241 | BoolMenuItem(i18n->getMessage(ConfigmenuSet, ConfigmenuDesktopWheeling, |
| 2251 | ConfigmenuSet, ConfigmenuDesktopWheeling, | ||
| 2252 | "Desktop MouseWheel Switching"), | 2242 | "Desktop MouseWheel Switching"), |
| 2253 | *resource.desktop_wheeling, saverc_cmd)); | 2243 | *resource.desktop_wheeling, saverc_cmd)); |
| 2254 | 2244 | ||
| @@ -2256,7 +2246,9 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) { | |||
| 2256 | *resource.click_raises, | 2246 | *resource.click_raises, |
| 2257 | saverc_cmd)); | 2247 | saverc_cmd)); |
| 2258 | // setup antialias cmd to reload style and save resource on toggle | 2248 | // setup antialias cmd to reload style and save resource on toggle |
| 2259 | menu.insert(new BoolMenuItem("antialias", *resource.antialias, | 2249 | menu.insert(new BoolMenuItem(i18n->getMessage(ConfigmenuSet, ConfigmenuAntiAlias, |
| 2250 | "AntiAlias"), | ||
| 2251 | *resource.antialias, | ||
| 2260 | save_and_reconfigure)); | 2252 | save_and_reconfigure)); |
| 2261 | 2253 | ||
| 2262 | FbTk::MenuItem *menu_alpha_item = new IntResMenuItem("Menu Alpha", resource.menu_alpha, | 2254 | FbTk::MenuItem *menu_alpha_item = new IntResMenuItem("Menu Alpha", resource.menu_alpha, |