summaryrefslogtreecommitdiff
path: root/beryl-plugins/src
diff options
context:
space:
mode:
authorguillaume <guillaume@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-12-24 20:23:10 +0000
committerguillaume <guillaume@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-12-24 20:23:10 +0000
commit9ebc33e50e487dae201cf437e608032554bddbcd (patch)
treec13b718cc38568d7eccf7c2670b0c5930ebb89e6 /beryl-plugins/src
parent9595d0d9e17f385119a9c21882410da7b760e784 (diff)
downloadmarex-dev-9ebc33e50e487dae201cf437e608032554bddbcd.tar.gz
marex-dev-9ebc33e50e487dae201cf437e608032554bddbcd.tar.bz2
beryl-plugins: add grouping where needed, still very unpolished, please test & report possible enhancements
git-svn-id: file:///beryl/trunk@2051 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src')
-rw-r--r--beryl-plugins/src/inputzoom.c4
-rw-r--r--beryl-plugins/src/resize.c24
-rw-r--r--beryl-plugins/src/rotate.c116
-rw-r--r--beryl-plugins/src/scale.c46
-rw-r--r--beryl-plugins/src/showdesktop.c16
-rw-r--r--beryl-plugins/src/splash.c16
-rw-r--r--beryl-plugins/src/state.c44
-rw-r--r--beryl-plugins/src/switcher.c48
-rw-r--r--beryl-plugins/src/trailfocus.c36
-rw-r--r--beryl-plugins/src/water.c30
-rw-r--r--beryl-plugins/src/zoom.c33
11 files changed, 199 insertions, 214 deletions
diff --git a/beryl-plugins/src/inputzoom.c b/beryl-plugins/src/inputzoom.c
index d74e991..2b4a5d4 100644
--- a/beryl-plugins/src/inputzoom.c
+++ b/beryl-plugins/src/inputzoom.c
@@ -822,7 +822,7 @@ static void zoomDisplayInitOptions(ZoomDisplay * zd)
o->advanced = False;
o->name = "zoom_in";
o->group = N_("Bindings");
- o->subGroup = N_("Zoom in");
+ o->subGroup = N_("Zoom In");
o->displayHints = "";
o->shortDesc = N_("Zoom In");
o->longDesc = N_("Zoom In");
@@ -841,7 +841,7 @@ static void zoomDisplayInitOptions(ZoomDisplay * zd)
o->advanced = False;
o->name = "zoom_out";
o->group = N_("Bindings");
- o->subGroup = N_("Zoom out");
+ o->subGroup = N_("Zoom Out");
o->displayHints = "";
o->shortDesc = N_("Zoom Out");
o->longDesc = N_("Zoom Out");
diff --git a/beryl-plugins/src/resize.c b/beryl-plugins/src/resize.c
index 0197584..3de3309 100644
--- a/beryl-plugins/src/resize.c
+++ b/beryl-plugins/src/resize.c
@@ -1171,7 +1171,7 @@ static void resizeDisplayInitOptions(ResizeDisplay * rd)
o = &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE];
o->advanced = False;
o->name = "initiate";
- o->group = N_("");
+ o->group = N_("Binding");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Initiate Window Resize");
@@ -1194,7 +1194,7 @@ static void resizeDisplayInitOptions(ResizeDisplay * rd)
o = &rd->opt[RESIZE_DISPLAY_OPTION_WARP_POINTER];
o->advanced = False;
o->name = "warp_pointer";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc =
@@ -1209,8 +1209,8 @@ static void resizeDisplayInitOptions(ResizeDisplay * rd)
o = &rd->opt[RESIZE_DISPLAY_OPTION_OPACITY];
o->advanced = False;
o->name = "opacity";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Appearance");
+ o->subGroup = N_("Opacity");
o->displayHints = "";
o->shortDesc = N_("Opacity");
o->longDesc = N_("Opacity level of resizing windows");
@@ -1222,8 +1222,8 @@ static void resizeDisplayInitOptions(ResizeDisplay * rd)
o = &rd->opt[RESIZE_DISPLAY_OPTION_OPACIFY_MIN_OPACITY];
o->advanced = False;
o->name = "opacify_min_opacity";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Appearance");
+ o->subGroup = N_("Opacity");
o->displayHints = "";
o->shortDesc = N_("Minimum opacity for opacify");
o->longDesc =
@@ -1237,7 +1237,7 @@ static void resizeDisplayInitOptions(ResizeDisplay * rd)
o = &rd->opt[RESIZE_DISPLAY_OPTION_SYNC_WINDOW];
o->advanced = False;
o->name = "sync_window";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Repaints the window on each resize step");
@@ -1250,7 +1250,7 @@ static void resizeDisplayInitOptions(ResizeDisplay * rd)
o = &rd->opt[RESIZE_DISPLAY_OPTION_MODE];
o->advanced = False;
o->name = "resize_mode";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Resize Display Mode");
@@ -1266,8 +1266,8 @@ static void resizeDisplayInitOptions(ResizeDisplay * rd)
o = &rd->opt[RESIZE_DISPLAY_OPTION_BORDER_COLOR];
o->advanced = False;
o->name = "border_color";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Appearance");
+ o->subGroup = N_("Outline Mode");
o->displayHints = "";
o->shortDesc = N_("Outline Color");
o->longDesc = N_("Outline color for outline and filled outline mode");
@@ -1280,8 +1280,8 @@ static void resizeDisplayInitOptions(ResizeDisplay * rd)
o = &rd->opt[RESIZE_DISPLAY_OPTION_FILL_COLOR];
o->advanced = False;
o->name = "fill_color";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Appearance");
+ o->subGroup = N_("Outline Mode");
o->displayHints = "";
o->shortDesc = N_("Fill Color");
o->longDesc = N_("Fill color for filled outline mode");
diff --git a/beryl-plugins/src/rotate.c b/beryl-plugins/src/rotate.c
index 454be84..5983636 100644
--- a/beryl-plugins/src/rotate.c
+++ b/beryl-plugins/src/rotate.c
@@ -350,8 +350,8 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_POINTER_INVERT_Y];
o->advanced = False;
o->name = "invert_y";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Behaviour");
+ o->subGroup = N_("General");
o->displayHints = "";
o->shortDesc = N_("Pointer Invert Y");
o->longDesc =
@@ -362,7 +362,7 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_POINTER_SENSITIVITY];
o->advanced = False;
o->name = "sensitivity";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Pointer Sensitivity");
@@ -376,7 +376,7 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_ACCELERATION];
o->advanced = False;
o->name = "acceleration";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Acceleration");
@@ -390,8 +390,8 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_SNAP_TOP];
o->advanced = False;
o->name = "snap_top";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Behaviour");
+ o->subGroup = N_("General");
o->displayHints = "";
o->shortDesc = N_("Snap To Top Face");
o->longDesc = N_("Snap Cube Rotation to Top Face");
@@ -401,8 +401,8 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_SNAP_BOTTOM];
o->advanced = False;
o->name = "snap_bottom";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Behaviour");
+ o->subGroup = N_("General");
o->displayHints = "";
o->shortDesc = N_("Snap To Bottom Face");
o->longDesc = N_("Snap Cube Rotation to Bottom Face");
@@ -412,7 +412,7 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_SPEED];
o->advanced = False;
o->name = "speed";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Speed");
@@ -426,7 +426,7 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_TIMESTEP];
o->advanced = False;
o->name = "timestep";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Timestep");
@@ -440,7 +440,7 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_MANTIMESTEP];
o->advanced = False;
o->name = "mantimestep";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Manual Timestep");
@@ -454,8 +454,8 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_ZOOM];
o->advanced = False;
o->name = "zoom";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Behaviour");
+ o->subGroup = N_("General");
o->displayHints = "";
o->shortDesc = N_("Zoom");
o->longDesc =
@@ -469,8 +469,8 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_ZOOM_BEFORE_ROTATE];
o->advanced = False;
o->name = "zoom_before_rotate";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Behaviour");
+ o->subGroup = N_("General");
o->displayHints = "";
o->shortDesc = N_("Zoom before rotate");
o->longDesc = N_("Zoom out before doing rotation");
@@ -480,8 +480,8 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_ZOOM_ONLY_ON_INITIATE];
o->advanced = False;
o->name = "zoom_initiate_only";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Behaviour");
+ o->subGroup = N_("General");
o->displayHints = "";
o->shortDesc = N_("Zoom only on initiate.");
o->longDesc =
@@ -493,8 +493,8 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_WHEEL_ON_EDGES];
o->advanced = False;
o->name = "wheel_on_edges";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Behaviour");
+ o->subGroup = N_("General");
o->displayHints = "";
o->shortDesc = N_("Rotate with wheel near edges");
o->longDesc = N_("Enable rotate through mouse wheel near screen edges");
@@ -504,7 +504,7 @@ static void rotateScreenInitOptions(RotateScreen * rs)
o = &rs->opt[ROTATE_SCREEN_OPTION_WHEELMAXDIST];
o->advanced = False;
o->name = "wheel_max_dist";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Max distance from edge to rotate");
@@ -2280,8 +2280,8 @@ static void rotateDisplayInitOptions(RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_INITIATE];
o->advanced = False;
o->name = "initiate";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Initiate");
o->displayHints = "";
o->shortDesc = N_("Initiate");
o->longDesc = N_("Start Rotation");
@@ -2299,8 +2299,8 @@ static void rotateDisplayInitOptions(RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_WHEELINGS];
o->advanced = False;
o->name = "rotate_wheelings";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Behaviour");
+ o->subGroup = N_("General");
o->displayHints = "";
o->shortDesc = N_("Mouse Wheel Scrolls for Rotation");
o->longDesc = N_("Number of mouse wheel scrolls required for rotation");
@@ -2312,8 +2312,8 @@ static void rotateDisplayInitOptions(RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_LEFT_WHEEL];
o->advanced = False;
o->name = "rotate_left_wheel";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Rotate Left");
o->displayHints = "";
o->shortDesc = N_("Rotate Left with Mouse Wheel");
o->longDesc = N_("Rotate left with mouse wheel");
@@ -2330,8 +2330,8 @@ static void rotateDisplayInitOptions(RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_RIGHT_WHEEL];
o->advanced = False;
o->name = "rotate_right_wheel";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Rotate Right");
o->displayHints = "";
o->shortDesc = N_("Rotate Right with Mouse Wheel");
o->longDesc = N_("Rotate right with mouse wheel");
@@ -2348,8 +2348,8 @@ static void rotateDisplayInitOptions(RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_LEFT];
o->advanced = False;
o->name = "rotate_left";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Rotate Left");
o->displayHints = "";
o->shortDesc = N_("Rotate Left");
o->longDesc = N_("Rotate left");
@@ -2369,8 +2369,8 @@ static void rotateDisplayInitOptions(RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_RIGHT];
o->advanced = False;
o->name = "rotate_right";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Rotate Right");
o->displayHints = "";
o->shortDesc = N_("Rotate Right");
o->longDesc = N_("Rotate right");
@@ -2390,8 +2390,8 @@ static void rotateDisplayInitOptions(RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_UP];
o->advanced = False;
o->name = "rotate_up";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Rotate Up");
o->displayHints = "";
o->shortDesc = N_("Rotate Up");
o->longDesc = N_("Rotate up");
@@ -2411,8 +2411,8 @@ static void rotateDisplayInitOptions(RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_DOWN];
o->advanced = False;
o->name = "rotate_down";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Rotate Down");
o->displayHints = "";
o->shortDesc = N_("Rotate Down");
o->longDesc = N_("Rotate down");
@@ -2432,8 +2432,8 @@ static void rotateDisplayInitOptions(RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_LEFT_WINDOW];
o->advanced = False;
o->name = "rotate_left_window";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Rotate Left");
o->displayHints = "";
o->shortDesc = N_("Rotate Left with Window");
o->longDesc = N_("Rotate left and bring active window " "along");
@@ -2454,8 +2454,8 @@ static void rotateDisplayInitOptions(RotateDisplay * rd)
o = &rd->opt[ROTATE_DISPLAY_OPTION_RIGHT_WINDOW];
o->advanced = False;
o->name = "rotate_right_window";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Rotate Right");
o->displayHints = "";
o->shortDesc = N_("Rotate Right with Window");
o->longDesc = N_("Rotate right and bring active window " "along");
@@ -2484,8 +2484,8 @@ static void rotateDisplayInitOptions(RotateDisplay * rd)
o->advanced=False;\
o->name = "rotate_to_" #n; \
asprintf (&str, ROTATE_TO_SHORT, n); \
- o->group=N_("");\
-o->subGroup=N_("");\
+ o->group=N_("Bindings");\
+o->subGroup=N_("Face shortcuts");\
o->displayHints="";\
o->shortDesc = str; \
asprintf (&str, ROTATE_TO_LONG, n); \
@@ -2503,8 +2503,8 @@ o->shortDesc = str; \
o->advanced=False;\
o->name = "rotate_to_" #n "_window"; \
asprintf (&str, ROTATE_TO_WINDOW_SHORT, n); \
- o->group=N_("");\
-o->subGroup=N_("");\
+ o->group=N_("Bindings");\
+o->subGroup=N_("Face shortcuts");\
o->displayHints="";\
o->shortDesc = str; \
asprintf (&str, ROTATE_TO_WINDOW_LONG, n); \
@@ -2566,8 +2566,8 @@ o->shortDesc = str; \
o = &rd->opt[ROTATE_DISPLAY_OPTION_FLIP_LEFT];
o->advanced = False;
o->name = "rotate_flip_left";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Edge Flip");
o->displayHints = "";
o->shortDesc = N_("Rotate Flip Left");
o->longDesc = N_("Flip to left viewport and warp " "pointer");
@@ -2585,8 +2585,8 @@ o->shortDesc = str; \
o = &rd->opt[ROTATE_DISPLAY_OPTION_FLIP_RIGHT];
o->advanced = False;
o->name = "rotate_flip_right";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Edge Flip");
o->displayHints = "";
o->shortDesc = N_("Rotate Flip Right");
o->longDesc = N_("Flip to right viewport and warp " "pointer");
@@ -2604,8 +2604,8 @@ o->shortDesc = str; \
o = &rd->opt[ROTATE_DISPLAY_OPTION_EDGEFLIP_POINTER];
o->advanced = False;
o->name = "edge_flip_pointer";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Behaviour");
+ o->subGroup = N_("Edge Flip");
o->displayHints = "";
o->shortDesc = N_("Edge Flip Pointer");
o->longDesc =
@@ -2616,8 +2616,8 @@ o->shortDesc = str; \
o = &rd->opt[ROTATE_DISPLAY_OPTION_EDGEFLIP_WINDOW];
o->advanced = False;
o->name = "edge_flip_move";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Behaviour");
+ o->subGroup = N_("Edge Flip");
o->displayHints = "";
o->shortDesc = N_("Edge Flip Move");
o->longDesc =
@@ -2628,8 +2628,8 @@ o->shortDesc = str; \
o = &rd->opt[ROTATE_DISPLAY_OPTION_EDGEFLIP_DND];
o->advanced = False;
o->name = "edge_flip_dnd";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Behaviour");
+ o->subGroup = N_("Edge Flip");
o->displayHints = "";
o->shortDesc = N_("Edge Flip DnD");
o->longDesc =
@@ -2641,8 +2641,8 @@ o->shortDesc = str; \
o = &rd->opt[ROTATE_DISPLAY_OPTION_FLIPTIME];
o->advanced = False;
o->name = "flip_time";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Behaviour");
+ o->subGroup = N_("Edge Flip");
o->displayHints = "";
o->shortDesc = N_("Flip Time");
o->longDesc = N_("Timeout before flipping viewport");
@@ -2654,8 +2654,8 @@ o->shortDesc = str; \
o = &rd->opt[ROTATE_DISPLAY_OPTION_INITIATEDESKTOP];
o->advanced = False;
o->name = "initiatedesktop";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Initiate");
o->displayHints = "";
o->shortDesc = N_("Initiate on desktop");
o->longDesc = N_("Start Rotation, but only when issued over desktop");
diff --git a/beryl-plugins/src/scale.c b/beryl-plugins/src/scale.c
index 218e416..84d96fe 100644
--- a/beryl-plugins/src/scale.c
+++ b/beryl-plugins/src/scale.c
@@ -469,7 +469,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_SPACING];
o->advanced = False;
o->name = "spacing";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Spacing");
@@ -482,7 +482,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_SLOPPY_FOCUS];
o->advanced = False;
o->name = "sloppy_focus";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Sloppy Focus");
@@ -493,7 +493,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_SPEED];
o->advanced = False;
o->name = "speed";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Speed");
@@ -507,7 +507,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_DARKEN_BACK_FACTOR];
o->advanced = False;
o->name = "darken_back_factor";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Darken Back factor");
@@ -521,7 +521,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_TIMESTEP];
o->advanced = False;
o->name = "timestep";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Timestep");
@@ -535,7 +535,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_WINDOW_TYPE];
o->advanced = False;
o->name = "window_types";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Window Types");
@@ -554,7 +554,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_DARKEN_BACK];
o->advanced = False;
o->name = "darken_back";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Darken Background");
@@ -567,7 +567,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_OPACITY];
o->advanced = False;
o->name = "opacity";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Opacity");
@@ -580,7 +580,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_USE_CLASS];
o->advanced = False;
o->name = "use_class";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Use WM_CLASS for only-current");
@@ -593,7 +593,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_HEAD];
o->advanced = False;
o->name = "head";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Head");
@@ -606,7 +606,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_ICON];
o->advanced = False;
o->name = "overlay_icon";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Overlay Icon");
@@ -619,7 +619,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_SCALE_METHOD];
o->advanced = False;
o->name = "scale_method";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Scaling method");
@@ -632,7 +632,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_ALLOW_KEYBOARD_INPUT];
o->advanced = False;
o->name = "allow_keyboard_input";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Allow Keyboard Input");
@@ -643,7 +643,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_SHOW_MINIMIZED];
o->advanced = False;
o->name = "show_minimized";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Show minimized windows");
@@ -654,7 +654,7 @@ static void scaleScreenInitOptions(ScaleScreen * ss)
o = &ss->opt[SCALE_SCREEN_OPTION_HOVER_TIME];
o->advanced = False;
o->name = "hover_time";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Hover Time");
@@ -2981,8 +2981,8 @@ static void scaleDisplayInitOptions(ScaleDisplay * sd)
o = &sd->opt[SCALE_DISPLAY_OPTION_INITIATE_NORMAL];
o->advanced = False;
o->name = "initiate";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Initiate Window Picker");
o->displayHints = "";
o->shortDesc = N_("Initiate Window Picker");
o->longDesc = N_("Layout and start transforming windows");
@@ -3002,8 +3002,8 @@ static void scaleDisplayInitOptions(ScaleDisplay * sd)
o = &sd->opt[SCALE_DISPLAY_OPTION_INITIATE_APP];
o->advanced = False;
o->name = "initiate_app";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Initiate Window Picker for Current App");
o->displayHints = "";
o->shortDesc = N_("Initiate Window Picker for Current App");
o->longDesc =
@@ -3026,8 +3026,8 @@ static void scaleDisplayInitOptions(ScaleDisplay * sd)
o = &sd->opt[SCALE_DISPLAY_OPTION_INITIATE_ALL];
o->advanced = False;
o->name = "initiate_all";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Initiate Window Picker for All Workspaces");
o->displayHints = "";
o->shortDesc = N_("Initiate Window Picker for All Workspaces");
o->longDesc =
@@ -3049,8 +3049,8 @@ static void scaleDisplayInitOptions(ScaleDisplay * sd)
o = &sd->opt[SCALE_DISPLAY_OPTION_INITIATE_CURRENT_HEAD];
o->advanced = False;
o->name = "initiate_current_head";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Initiate current head scale only");
o->displayHints = "";
o->shortDesc = N_("Initiate current head scale only");
o->longDesc = N_("Only scale windows on the current monitor");
diff --git a/beryl-plugins/src/showdesktop.c b/beryl-plugins/src/showdesktop.c
index 7828e2a..60324d2 100644
--- a/beryl-plugins/src/showdesktop.c
+++ b/beryl-plugins/src/showdesktop.c
@@ -439,7 +439,7 @@ static void showdesktopDisplayInitOptions(ShowdesktopDisplay * sd)
o = &sd->opt[SD_DISPLAY_OPTION_INITIATE];
o->advanced = False;
o->name = "initiate";
- o->group = N_("");
+ o->group = N_("Binding");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Initiate showdesktop mode");
@@ -464,7 +464,7 @@ static void showdesktopScreenInitOptions(ShowdesktopScreen * ss)
o = &ss->opt[SD_SCREEN_OPTION_SPEED];
o->advanced = False;
o->name = "speed";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Speed");
@@ -478,7 +478,7 @@ static void showdesktopScreenInitOptions(ShowdesktopScreen * ss)
o = &ss->opt[SD_SCREEN_OPTION_TIMESTEP];
o->advanced = False;
o->name = "timestep";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Timestep");
@@ -492,7 +492,7 @@ static void showdesktopScreenInitOptions(ShowdesktopScreen * ss)
o = &ss->opt[SD_SCREEN_OPTION_DIRECTION];
o->advanced = False;
o->name = "direction";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Window direction");
@@ -507,7 +507,7 @@ static void showdesktopScreenInitOptions(ShowdesktopScreen * ss)
o = &ss->opt[SD_SCREEN_OPTION_WINDOW_TYPE];
o->advanced = False;
o->name = "window_types";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Window Types");
@@ -525,7 +525,7 @@ static void showdesktopScreenInitOptions(ShowdesktopScreen * ss)
o = &ss->opt[SD_SCREEN_OPTION_USE_SCALE_SETTINGS];
o->advanced = False;
o->name = "use_scale_settings";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Use scale settings");
@@ -538,7 +538,7 @@ static void showdesktopScreenInitOptions(ShowdesktopScreen * ss)
o = &ss->opt[SD_SCREEN_OPTION_WINDOW_OPACITY];
o->advanced = False;
o->name = "window_opacity";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Window opacity when showdesktop'd");
@@ -552,7 +552,7 @@ static void showdesktopScreenInitOptions(ShowdesktopScreen * ss)
o = &ss->opt[SD_SCREEN_OPTION_WINDOW_PART_SIZE];
o->advanced = False;
o->name = "window_part_size";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Window part size when showdesktop'd");
diff --git a/beryl-plugins/src/splash.c b/beryl-plugins/src/splash.c
index c38e5a8..3d7b58c 100644
--- a/beryl-plugins/src/splash.c
+++ b/beryl-plugins/src/splash.c
@@ -728,7 +728,7 @@ static void splashDisplayInitOptions(SplashDisplay * sd)
o = &sd->opt[SPLASH_DISPLAY_OPTION_INITIATE];
o->advanced = False;
o->name = "initiate";
- o->group = N_("");
+ o->group = N_("Binding");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Initiate");
@@ -747,7 +747,7 @@ static void splashDisplayInitOptions(SplashDisplay * sd)
o = &sd->opt[SPLASH_DISPLAY_OPTION_BACKGROUND];
o->advanced = False;
o->name = "background_file";
- o->group = N_("");
+ o->group = N_("Images");
o->subGroup = N_("");
o->displayHints = "file;image;pngonly;";
o->shortDesc = N_("background file");
@@ -760,7 +760,7 @@ static void splashDisplayInitOptions(SplashDisplay * sd)
o = &sd->opt[SPLASH_DISPLAY_OPTION_LOGO];
o->advanced = False;
o->name = "logo_file";
- o->group = N_("");
+ o->group = N_("Images");
o->subGroup = N_("");
o->displayHints = "file;image;pngonly;";
o->shortDesc = N_("Logo file");
@@ -773,7 +773,7 @@ static void splashDisplayInitOptions(SplashDisplay * sd)
o = &sd->opt[SPLASH_DISPLAY_OPTION_FADE_TIME];
o->advanced = False;
o->name = "fade_time";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Fade Time");
@@ -787,7 +787,7 @@ static void splashDisplayInitOptions(SplashDisplay * sd)
o = &sd->opt[SPLASH_DISPLAY_OPTION_DISPLAY_TIME];
o->advanced = False;
o->name = "display_time";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Display Time");
@@ -801,7 +801,7 @@ static void splashDisplayInitOptions(SplashDisplay * sd)
o = &sd->opt[SPLASH_DISPLAY_OPTION_SATURATION];
o->advanced = False;
o->name = "saturation";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Saturation");
@@ -815,7 +815,7 @@ static void splashDisplayInitOptions(SplashDisplay * sd)
o = &sd->opt[SPLASH_DISPLAY_OPTION_BRIGHTNESS];
o->advanced = False;
o->name = "brightness";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Brightness");
@@ -829,7 +829,7 @@ static void splashDisplayInitOptions(SplashDisplay * sd)
o = &sd->opt[SPLASH_DISPLAY_OPTION_DISABLE_UPDATE];
o->advanced = False;
o->name = "disable_update";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Disable updates");
diff --git a/beryl-plugins/src/state.c b/beryl-plugins/src/state.c
index be87146..c51b2e0 100644
--- a/beryl-plugins/src/state.c
+++ b/beryl-plugins/src/state.c
@@ -271,8 +271,8 @@ static void stateScreenInitOptions(StateScreen * fs)
o = &fs->opt[STATE_SCREEN_OPTION_OPACITY];
o->advanced = False;
o->name = "opacity";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Rules");
+ o->subGroup = N_("Window Opacity");
o->displayHints = "";
o->shortDesc = N_("Window Opacity");
o->longDesc = N_("Set window opacity by conditions");
@@ -286,8 +286,8 @@ static void stateScreenInitOptions(StateScreen * fs)
o = &fs->opt[STATE_SCREEN_OPTION_BRIGHTNESS];
o->advanced = False;
o->name = "brightness";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Rules");
+ o->subGroup = N_("Window Brightness");
o->displayHints = "";
o->shortDesc = N_("Window Brightness");
o->longDesc = N_("Set window brightness by conditions");
@@ -301,8 +301,8 @@ static void stateScreenInitOptions(StateScreen * fs)
o = &fs->opt[STATE_SCREEN_OPTION_SATURATION];
o->advanced = False;
o->name = "saturation";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Rules");
+ o->subGroup = N_("Window Saturation");
o->displayHints = "";
o->shortDesc = N_("Window Saturation");
o->longDesc = N_("Set window saturation by conditions");
@@ -316,8 +316,8 @@ static void stateScreenInitOptions(StateScreen * fs)
o = &fs->opt[STATE_SCREEN_OPTION_VIEWPORT];
o->advanced = False;
o->name = "viewport";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Rules");
+ o->subGroup = N_("Initial Viewport");
o->displayHints = "";
o->shortDesc = N_("Initial Viewport");
o->longDesc = N_("Set initial viewport for windows by conditions");
@@ -328,27 +328,11 @@ static void stateScreenInitOptions(StateScreen * fs)
o->rest.s.string = 0; /* windowTypeString; */
o->rest.s.nString = 0; /* nWindowTypeString; */
-
-// o = &fs->opt[STATE_SCREEN_OPTION_WIDGET];
-// o->advanced=False;
- o->name = "widget";
-// o->group=N_("");
-// o->subGroup = N_("");
-// o->displayHints = "";
-// o->shortDesc = "Widget Hack";
-// o->longDesc = "Set to 2 to set widget state, 1 to clear.";
-// o->type = CompOptionTypeList;
-// o->value.list.type = CompOptionTypeString;
-// o->value.list.nValue = 0;
-// o->value.list.value = 0; /* NULL; */
-// o->rest.s.string = 0; /* windowTypeString; */
-// o->rest.s.nString = 0; /* nWindowTypeString; */
-
o = &fs->opt[STATE_SCREEN_OPTION_POSITION];
o->advanced = False;
o->name = "position";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Rules");
+ o->subGroup = N_("Position");
o->displayHints = "";
o->shortDesc = N_("Position");
o->longDesc =
@@ -363,8 +347,8 @@ static void stateScreenInitOptions(StateScreen * fs)
o = &fs->opt[STATE_SCREEN_OPTION_BORDER];
o->advanced = False;
o->name = "border";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Rules");
+ o->subGroup = N_("Border");
o->displayHints = "";
o->shortDesc = N_("Border");
o->longDesc = N_("Window border, set to 1 to disable");
@@ -378,8 +362,8 @@ static void stateScreenInitOptions(StateScreen * fs)
o = &fs->opt[STATE_SCREEN_OPTION_NOARGB];
o->advanced = False;
o->name = "noargb";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Rules");
+ o->subGroup = N_("Disable ARGB visual");
o->displayHints = "";
o->shortDesc = N_("Disable ARGB visual");
o->longDesc = N_("Set to 1 to disable ARGB visual");
diff --git a/beryl-plugins/src/switcher.c b/beryl-plugins/src/switcher.c
index a34b6f4..5d0cb4d 100644
--- a/beryl-plugins/src/switcher.c
+++ b/beryl-plugins/src/switcher.c
@@ -384,7 +384,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_SPEED];
o->advanced = False;
o->name = "speed";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Speed");
@@ -398,7 +398,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_TIMESTEP];
o->advanced = False;
o->name = "timestep";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Timestep");
@@ -412,7 +412,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_WINDOW_TYPE];
o->advanced = False;
o->name = "window_types";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Window Types");
@@ -431,7 +431,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_MIPMAP];
o->advanced = False;
o->name = "mipmap";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Mipmap");
@@ -444,7 +444,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_SATURATION];
o->advanced = False;
o->name = "saturation";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Saturation");
@@ -457,7 +457,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_BRIGHTNESS];
o->advanced = False;
o->name = "brightness";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Brightness");
@@ -470,7 +470,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_OPACITY];
o->advanced = False;
o->name = "opacity";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Opacity");
@@ -483,7 +483,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_BRINGTOFRONT];
o->advanced = False;
o->name = "bring_to_front";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Bring To Front");
@@ -494,7 +494,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_ALL_DESKTOPS];
o->advanced = False;
o->name = "all_desktops";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("All Desktops");
@@ -505,7 +505,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_ICON_CORNER];
o->advanced = False;
o->name = "icon_corner";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Icon Corner");
@@ -520,7 +520,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_ZOOM];
o->advanced = False;
o->name = "zoom";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Zoom");
@@ -535,7 +535,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_ICON];
o->advanced = False;
o->name = "icon";
- o->group = N_("");
+ o->group = N_("Appearance");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Icon");
@@ -546,7 +546,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_MINIMIZED];
o->advanced = False;
o->name = "minimized";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Minimized");
@@ -557,7 +557,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_SHOW_WINDOW_LIST];
o->advanced = False;
o->name = "show_window_list";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Show Window List");
@@ -568,7 +568,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_AUTO_ROTATE];
o->advanced = False;
o->name = "auto_rotate";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Auto Rotate");
@@ -579,7 +579,7 @@ static void switchScreenInitOptions(SwitchScreen * ss)
o = &ss->opt[SWITCH_SCREEN_OPTION_TEMP_UNMINIMIZE];
o->advanced = False;
o->name = "temp_unminimize";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Temp UnMinimize");
@@ -2054,8 +2054,8 @@ static void switchDisplayInitOptions(SwitchDisplay * sd)
o = &sd->opt[SWITCH_DISPLAY_OPTION_NEXT];
o->advanced = False;
o->name = "next";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Current workspace");
o->displayHints = "";
o->shortDesc = N_("Next window");
o->longDesc = N_("Popup switcher if not visible and "
@@ -2074,8 +2074,8 @@ static void switchDisplayInitOptions(SwitchDisplay * sd)
o = &sd->opt[SWITCH_DISPLAY_OPTION_PREV];
o->advanced = False;
o->name = "prev";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Current workspace");
o->displayHints = "";
o->shortDesc = N_("Prev window");
o->longDesc = N_("Popup switcher if not visible and "
@@ -2094,8 +2094,8 @@ static void switchDisplayInitOptions(SwitchDisplay * sd)
o = &sd->opt[SWITCH_DISPLAY_OPTION_NEXT_ALL];
o->advanced = False;
o->name = "next_all";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("All workspaces");
o->displayHints = "";
o->shortDesc = N_("Next window (All workspaces)");
o->longDesc = N_("Popup switcher if not visible and "
@@ -2114,8 +2114,8 @@ static void switchDisplayInitOptions(SwitchDisplay * sd)
o = &sd->opt[SWITCH_DISPLAY_OPTION_PREV_ALL];
o->advanced = False;
o->name = "prev_all";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("All workspaces");
o->displayHints = "";
o->shortDesc = N_("Prev window (All workspaces)");
o->longDesc = N_("Popup switcher if not visible and "
diff --git a/beryl-plugins/src/trailfocus.c b/beryl-plugins/src/trailfocus.c
index 1d8a35e..5139ff2 100644
--- a/beryl-plugins/src/trailfocus.c
+++ b/beryl-plugins/src/trailfocus.c
@@ -250,8 +250,8 @@ static void trailFocusScreenInitOptions(TrailFocusScreen * tfs)
o = &tfs->opt[TRAILFOCUS_SCREEN_OPTION_MINIMUM_OPACITY_LEVEL];
o->advanced = False;
o->name = "minimum_window_opacity_level";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Appearance");
+ o->subGroup = N_("Opacity");
o->displayHints = "";
o->shortDesc = N_("Opacity level of completely unfocused windows");
o->longDesc = N_("Opacity level of completely unfocused windows");
@@ -264,8 +264,8 @@ static void trailFocusScreenInitOptions(TrailFocusScreen * tfs)
o = &tfs->opt[TRAILFOCUS_SCREEN_OPTION_MAXIMUM_OPACITY_LEVEL];
o->advanced = False;
o->name = "maximum_window_opacity_level";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Appearance");
+ o->subGroup = N_("Opacity");
o->displayHints = "";
o->shortDesc = N_("Opacity level of completely focused windows");
o->longDesc = N_("Opacity level of completely focused windows");
@@ -278,8 +278,8 @@ static void trailFocusScreenInitOptions(TrailFocusScreen * tfs)
o = &tfs->opt[TRAILFOCUS_SCREEN_OPTION_MINIMUM_SATURATION_LEVEL];
o->advanced = False;
o->name = "minimum_window_saturation_level";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Appearance");
+ o->subGroup = N_("Saturation");
o->displayHints = "";
o->shortDesc = N_("Saturation level of completely unfocused windows");
o->longDesc = N_("Saturation level of completely unfocused windows");
@@ -292,8 +292,8 @@ static void trailFocusScreenInitOptions(TrailFocusScreen * tfs)
o = &tfs->opt[TRAILFOCUS_SCREEN_OPTION_MAXIMUM_SATURATION_LEVEL];
o->advanced = False;
o->name = "maximum_window_saturation_level";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Appearance");
+ o->subGroup = N_("Saturation");
o->displayHints = "";
o->shortDesc = N_("Saturation level of completely focused windows");
o->longDesc = N_("Saturation level of completely focused windows");
@@ -306,8 +306,8 @@ static void trailFocusScreenInitOptions(TrailFocusScreen * tfs)
o = &tfs->opt[TRAILFOCUS_SCREEN_OPTION_MINIMUM_BRIGHTNESS_LEVEL];
o->advanced = False;
o->name = "minimum_window_brightness_level";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Appearance");
+ o->subGroup = N_("Brightness");
o->displayHints = "";
o->shortDesc = N_("Brightness level of unfocused windows");
o->longDesc = N_("Brightness level of unfocused windows");
@@ -320,8 +320,8 @@ static void trailFocusScreenInitOptions(TrailFocusScreen * tfs)
o = &tfs->opt[TRAILFOCUS_SCREEN_OPTION_MAXIMUM_BRIGHTNESS_LEVEL];
o->advanced = False;
o->name = "maximum_window_brightness_level";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Appearance");
+ o->subGroup = N_("Brightness");
o->displayHints = "";
o->shortDesc = N_("Brightness level of focused windows");
o->longDesc = N_("Brightness level of focused windows");
@@ -335,7 +335,7 @@ static void trailFocusScreenInitOptions(TrailFocusScreen * tfs)
o = &tfs->opt[TRAILFOCUS_SCREEN_OPTION_MAXIMUM_TRAIL_COUNT];
o->advanced = False;
o->name = "maximum_trail_count";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Number of recently used windows to keep track of");
@@ -349,7 +349,7 @@ static void trailFocusScreenInitOptions(TrailFocusScreen * tfs)
o = &tfs->opt[TRAILFOCUS_SCREEN_OPTION_WINDOW_TYPE];
o->advanced = False;
o->name = "window_types";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Trailfocus window types");
@@ -368,7 +368,7 @@ static void trailFocusScreenInitOptions(TrailFocusScreen * tfs)
o = &tfs->opt[TRAILFOCUS_SCREEN_OPTION_IGNORE_SKIPTASKBAR];
o->advanced = False;
o->name = "ignore_skiptaskbar";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Ignore \"SkipTaskbar\" Windows");
@@ -379,7 +379,7 @@ static void trailFocusScreenInitOptions(TrailFocusScreen * tfs)
o = &tfs->opt[TRAILFOCUS_SCREEN_OPTION_IGNORE_SKIPPAGER];
o->advanced = False;
o->name = "ignore_skippager";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Ignore \"SkipPager\" Windows");
@@ -390,7 +390,7 @@ static void trailFocusScreenInitOptions(TrailFocusScreen * tfs)
o = &tfs->opt[TRAILFOCUS_SCREEN_OPTION_DISABLE_ON_SCREENGRAB_OF];
o->advanced = False;
o->name = "disable_on_screengrab";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Disable on screengrab of");
@@ -409,7 +409,7 @@ static void trailFocusScreenInitOptions(TrailFocusScreen * tfs)
o = &tfs->opt[TRAILFOCUS_SCREEN_OPTION_EXCLUDE_LIST];
o->advanced = False;
o->name = "exclude_list";
- o->group = N_("");
+ o->group = N_("Behaviour");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("WM_CLASS to exclude");
diff --git a/beryl-plugins/src/water.c b/beryl-plugins/src/water.c
index 36371ca..363e09e 100644
--- a/beryl-plugins/src/water.c
+++ b/beryl-plugins/src/water.c
@@ -1794,8 +1794,8 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_INITIATE];
o->advanced = False;
o->name = "initiate";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Pointer wave");
+ o->subGroup = N_("Initiate");
o->displayHints = "";
o->shortDesc = N_("Initiate");
o->longDesc = N_("Enable pointer water effects");
@@ -1812,7 +1812,7 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_TOGGLE_RAIN];
o->advanced = False;
o->name = "toggle_rain";
- o->group = N_("");
+ o->group = N_("Rain");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Toggle rain");
@@ -1831,7 +1831,7 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_TOGGLE_WIPER];
o->advanced = False;
o->name = "toggle_wiper";
- o->group = N_("");
+ o->group = N_("Rain");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Toggle wiper");
@@ -1850,7 +1850,7 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_OFFSET_SCALE];
o->advanced = False;
o->name = "offset_scale";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Offset Scale");
@@ -1864,7 +1864,7 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_TITLE_AMPL];
o->advanced = False;
o->name = "title_wave_amplitude";
- o->group = N_("");
+ o->group = N_("Title wave");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Title Wave Amplitude");
@@ -1878,7 +1878,7 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_RAIN_AMPL];
o->advanced = False;
o->name = "rain_wave_amplitude";
- o->group = N_("");
+ o->group = N_("Rain");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Rain Wave Maximum Amplitude");
@@ -1907,7 +1907,7 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_INIT_VERTICES];
o->advanced = False;
o->name = "initial_vertices";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Initial Vertices");
@@ -1922,7 +1922,7 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_RAIN_DELAY];
o->advanced = False;
o->name = "rain_delay";
- o->group = N_("");
+ o->group = N_("Rain");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Rain Delay");
@@ -1935,7 +1935,7 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_TITLE_WAVE];
o->advanced = False;
o->name = "title_wave";
- o->group = N_("");
+ o->group = N_("Title wave");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Title wave");
@@ -1951,7 +1951,7 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_POINT];
o->advanced = False;
o->name = "point";
- o->group = N_("");
+ o->group = N_("Misc. Options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Point");
@@ -1999,7 +1999,7 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_WIN];
o->advanced = False;
o->name = "window_wave";
- o->group = N_("");
+ o->group = N_("Window wave");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Window wave");
@@ -2017,7 +2017,7 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_UNGRAB_WAVE];
o->advanced = False;
o->name = "ungrab_wave";
- o->group = N_("");
+ o->group = N_("Window wave");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Ungrab Wave Effect");
@@ -2028,11 +2028,11 @@ static void waterDisplayInitOptions(WaterDisplay * wd)
o = &wd->opt[WATER_DISPLAY_OPTION_SHIVER_WIN];
o->advanced = False;
o->name = "shiver_window";
- o->group = N_("");
+ o->group = N_("Window wave");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Shiver window");
- o->longDesc = N_("Wobbly shiver when when doing window or ungrab wave");
+ o->longDesc = N_("Wobbly shiver when doing window or ungrab wave");
o->type = CompOptionTypeBool;
o->value.b = WATER_SHIVER_WIN_DEFAULT;
}
diff --git a/beryl-plugins/src/zoom.c b/beryl-plugins/src/zoom.c
index beaa1c1..122c6a8 100644
--- a/beryl-plugins/src/zoom.c
+++ b/beryl-plugins/src/zoom.c
@@ -241,7 +241,7 @@ static void zoomScreenInitOptions(ZoomScreen * zs)
o = &zs->opt[ZOOM_SCREEN_OPTION_POINTER_INVERT_Y];
o->advanced = False;
o->name = "invert_y";
- o->group = N_("");
+ o->group = N_("Misc. options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Pointer Invert Y");
@@ -252,7 +252,7 @@ static void zoomScreenInitOptions(ZoomScreen * zs)
o = &zs->opt[ZOOM_SCREEN_OPTION_POINTER_SENSITIVITY];
o->advanced = False;
o->name = "sensitivity";
- o->group = N_("");
+ o->group = N_("Misc. options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Pointer Sensitivity");
@@ -266,7 +266,7 @@ static void zoomScreenInitOptions(ZoomScreen * zs)
o = &zs->opt[ZOOM_SCREEN_OPTION_SPEED];
o->advanced = False;
o->name = "speed";
- o->group = N_("");
+ o->group = N_("Misc. options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Speed");
@@ -280,7 +280,7 @@ static void zoomScreenInitOptions(ZoomScreen * zs)
o = &zs->opt[ZOOM_SCREEN_OPTION_STEP];
o->advanced = False;
o->name = "step";
- o->group = N_("");
+ o->group = N_("Misc. options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Step");
@@ -296,7 +296,7 @@ static void zoomScreenInitOptions(ZoomScreen * zs)
o = &zs->opt[ZOOM_SCREEN_OPTION_MIN];
o->advanced = False;
o->name = "min";
- o->group = N_("");
+ o->group = N_("Misc. options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Minimum Zoom");
@@ -310,7 +310,7 @@ static void zoomScreenInitOptions(ZoomScreen * zs)
o = &zs->opt[ZOOM_SCREEN_OPTION_MAX];
o->advanced = False;
o->name = "max";
- o->group = N_("");
+ o->group = N_("Misc. options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Maximum Zoom");
@@ -324,7 +324,7 @@ static void zoomScreenInitOptions(ZoomScreen * zs)
o = &zs->opt[ZOOM_SCREEN_OPTION_TIMESTEP];
o->advanced = False;
o->name = "timestep";
- o->group = N_("");
+ o->group = N_("Misc. options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Timestep");
@@ -338,8 +338,8 @@ static void zoomScreenInitOptions(ZoomScreen * zs)
o = &zs->opt[ZOOM_SCREEN_OPTION_FILTER_LINEAR];
o->advanced = False;
o->name = "filter_linear";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Misc. options");
+ o->subGroup = N_("Visual quality");
o->displayHints = "";
o->shortDesc = N_("Filter Linear");
o->longDesc = N_("USe linear filter when zoomed in");
@@ -349,7 +349,7 @@ static void zoomScreenInitOptions(ZoomScreen * zs)
o = &zs->opt[ZOOM_SCREEN_OPTION_ALLOW_KEYBOARD_INPUT];
o->advanced = False;
o->name = "allow_keyboard_input";
- o->group = N_("");
+ o->group = N_("Misc. options");
o->subGroup = N_("");
o->displayHints = "";
o->shortDesc = N_("Allow Keyboard Input");
@@ -357,6 +357,7 @@ static void zoomScreenInitOptions(ZoomScreen * zs)
o->type = CompOptionTypeBool;
o->value.b = ZOOM_ALLOW_KEYBOARD_INPUT_DEFAULT;
}
+
static CompOption *zoomGetScreenOptions(CompScreen * screen, int *count)
{
if (screen)
@@ -878,8 +879,8 @@ static void zoomDisplayInitOptions(ZoomDisplay * zd)
o = &zd->opt[ZOOM_DISPLAY_OPTION_INITIATE];
o->advanced = False;
o->name = "initiate";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Initiate");
o->displayHints = "";
o->shortDesc = N_("Initiate");
o->longDesc = N_("Zoom In");
@@ -897,8 +898,8 @@ static void zoomDisplayInitOptions(ZoomDisplay * zd)
o = &zd->opt[ZOOM_DISPLAY_OPTION_IN];
o->advanced = False;
o->name = "zoom_in";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Zoom In");
o->displayHints = "";
o->shortDesc = N_("Zoom In");
o->longDesc = N_("Zoom In");
@@ -916,8 +917,8 @@ static void zoomDisplayInitOptions(ZoomDisplay * zd)
o = &zd->opt[ZOOM_DISPLAY_OPTION_OUT];
o->advanced = False;
o->name = "zoom_out";
- o->group = N_("");
- o->subGroup = N_("");
+ o->group = N_("Bindings");
+ o->subGroup = N_("Zoom Out");
o->displayHints = "";
o->shortDesc = N_("Zoom Out");
o->longDesc = N_("Zoom Out");