From b1b95e086db04bc8f779ba434c5b58efc8f38100 Mon Sep 17 00:00:00 2001 From: o9000 Date: Fri, 12 Jun 2015 01:42:00 +0200 Subject: [PATCH] Free space item --- AUTHORS | 1 + CMakeLists.txt | 4 +- ChangeLog | 2 + src/panel.c | 11 +- src/panel.h | 3 + src/tint2conf/po/tint2conf.pot | 520 +++++++++++++++++---------------- src/tint2conf/properties.c | 8 + 7 files changed, 287 insertions(+), 262 deletions(-) diff --git a/AUTHORS b/AUTHORS index 8a4cc42..ab4fa93 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,6 +5,7 @@ tint2 is developped by : - Euan Freeman (tintwizard) - Christian Ruppert (autotools build system) - Ovidiu M : launcher, bug fixes +- Mishael A Sibiryakov (death@junki.org) : freespace tint2 is based on ttm source code (http://code.google.com/p/ttm/) - 2007-2008 Pål Staurland diff --git a/CMakeLists.txt b/CMakeLists.txt index e694e1e..ed83d57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,7 @@ include_directories( ${PROJECT_BINARY_DIR} src/launcher src/tooltip src/util + src/freespace ${X11_INCLUDE_DIRS} ${PANGOCAIRO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS} @@ -67,7 +68,8 @@ set( SOURCES src/config.c src/taskbar/taskbar.c src/taskbar/taskbarname.c src/tooltip/tooltip.c - src/util/area.c + src/freespace/freespace.c + src/util/area.c src/util/common.c src/util/strnatcmp.c src/util/timer.c diff --git a/ChangeLog b/ChangeLog index a27665d..72a697e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ - taskbar_hide_inactive_tasks - taskbar_sort_order - taskbar_name (already released by distros) + - task_align (already released by distros) - Launcher: - launcher* (already released by distros) - launcher_apps_dir (previously patched in by some distros) @@ -34,6 +35,7 @@ - launcher_icon_theme_override - System tray: - systray_monitor + - Freespace (already released by distros) - Config options with changed behavior: - Panel: - panel_dock: previously, 'panel_dock = 1' was actually not placing the panel into the dock. This option now diff --git a/src/panel.c b/src/panel.c index 8c0d61f..114b811 100644 --- a/src/panel.c +++ b/src/panel.c @@ -204,6 +204,8 @@ void init_panel() } if (panel_items_order[k] == 'C') init_clock_panel(p); + if (panel_items_order[k] == 'F') + init_freespace_panel(p); } set_panel_items_order(p); @@ -322,13 +324,13 @@ void init_panel_size_and_position(Panel *panel) int resize_panel(void *obj) { - resize_by_layout(obj, 0); + Panel *panel = (Panel*)obj; + resize_by_layout(panel, 0); //printf("resize_panel\n"); if (panel_mode != MULTI_DESKTOP && taskbar_enabled) { // propagate width/height on hidden taskbar int i, width, height; - Panel *panel = (Panel*)obj; width = panel->taskbar[server.desktop].area.width; height = panel->taskbar[server.desktop].area.height; for (i=0 ; i < panel->nb_desktop ; i++) { @@ -339,7 +341,6 @@ int resize_panel(void *obj) } if (panel_mode == MULTI_DESKTOP && taskbar_enabled && taskbar_distribute_size) { // Distribute the available space between taskbars - Panel *panel = (Panel*)obj; // Compute the total available size, and the total size requested by the taskbars int total_size = 0; @@ -418,6 +419,8 @@ int resize_panel(void *obj) } } } + if (panel->freespace.area.on_screen) + panel->freespace.area.resize = 1; return 0; } @@ -505,6 +508,8 @@ void set_panel_items_order(Panel *p) } if (panel_items_order[k] == 'C') p->area.list = g_list_append(p->area.list, &p->clock); + if (panel_items_order[k] == 'F') + p->area.list = g_list_append(p->area.list, &p->freespace); } init_rendering(&p->area, 0); } diff --git a/src/panel.h b/src/panel.h index e4f783d..bfd96f3 100644 --- a/src/panel.h +++ b/src/panel.h @@ -20,6 +20,7 @@ #include "taskbar.h" #include "systraybar.h" #include "launcher.h" +#include "freespace.h" #ifdef ENABLE_BATTERY #include "battery.h" @@ -116,6 +117,8 @@ typedef struct { Launcher launcher; + FreeSpace freespace; + // autohide int is_hidden; int hidden_width, hidden_height; diff --git a/src/tint2conf/po/tint2conf.pot b/src/tint2conf/po/tint2conf.pot index 6a175ec..e7a70f6 100644 --- a/src/tint2conf/po/tint2conf.pot +++ b/src/tint2conf/po/tint2conf.pot @@ -148,11 +148,11 @@ msgstr "" msgid "Panel items" msgstr "" -#: ../properties.c:267 ../properties.c:1263 ../properties.c:1443 +#: ../properties.c:267 ../properties.c:1263 ../properties.c:1448 msgid "Launcher" msgstr "" -#: ../properties.c:275 ../properties.c:1258 ../properties.c:1440 +#: ../properties.c:275 ../properties.c:1258 ../properties.c:1445 msgid "Taskbar" msgstr "" @@ -160,15 +160,15 @@ msgstr "" msgid "Task buttons" msgstr "" -#: ../properties.c:291 ../properties.c:1248 ../properties.c:1434 +#: ../properties.c:291 ../properties.c:1248 ../properties.c:1439 msgid "Clock" msgstr "" -#: ../properties.c:299 ../properties.c:1253 ../properties.c:1437 +#: ../properties.c:299 ../properties.c:1253 ../properties.c:1442 msgid "System tray" msgstr "" -#: ../properties.c:307 ../properties.c:1243 ../properties.c:1431 +#: ../properties.c:307 ../properties.c:1243 ../properties.c:1436 msgid "Battery" msgstr "" @@ -280,7 +280,7 @@ msgstr "" msgid "Position on screen: bottom-right, horizontal panel" msgstr "" -#: ../properties.c:834 ../properties.c:3464 +#: ../properties.c:834 ../properties.c:3472 msgid "Monitor" msgstr "" @@ -288,27 +288,27 @@ msgstr "" msgid "All" msgstr "" -#: ../properties.c:845 ../properties.c:3474 +#: ../properties.c:845 ../properties.c:3482 msgid "1" msgstr "" -#: ../properties.c:846 ../properties.c:3475 +#: ../properties.c:846 ../properties.c:3483 msgid "2" msgstr "" -#: ../properties.c:847 ../properties.c:3476 +#: ../properties.c:847 ../properties.c:3484 msgid "3" msgstr "" -#: ../properties.c:848 ../properties.c:3477 +#: ../properties.c:848 ../properties.c:3485 msgid "4" msgstr "" -#: ../properties.c:849 ../properties.c:3478 +#: ../properties.c:849 ../properties.c:3486 msgid "5" msgstr "" -#: ../properties.c:850 ../properties.c:3479 +#: ../properties.c:850 ../properties.c:3487 msgid "6" msgstr "" @@ -380,15 +380,15 @@ msgid "" "distributed on both sides of the panel." msgstr "" -#: ../properties.c:936 ../properties.c:2019 ../properties.c:2340 -#: ../properties.c:2763 ../properties.c:3277 ../properties.c:3486 -#: ../properties.c:3692 ../properties.c:3850 +#: ../properties.c:936 ../properties.c:2027 ../properties.c:2348 +#: ../properties.c:2771 ../properties.c:3285 ../properties.c:3494 +#: ../properties.c:3700 ../properties.c:3858 msgid "Appearance" msgstr "" -#: ../properties.c:950 ../properties.c:2032 ../properties.c:3114 -#: ../properties.c:3290 ../properties.c:3499 ../properties.c:3705 -#: ../properties.c:3863 +#: ../properties.c:950 ../properties.c:2040 ../properties.c:3122 +#: ../properties.c:3298 ../properties.c:3507 ../properties.c:3713 +#: ../properties.c:3871 msgid "Background" msgstr "" @@ -398,9 +398,9 @@ msgid "" "in the Backgrounds tab." msgstr "" -#: ../properties.c:965 ../properties.c:2046 ../properties.c:2354 -#: ../properties.c:2457 ../properties.c:2854 ../properties.c:3304 -#: ../properties.c:3514 ../properties.c:3719 ../properties.c:3877 +#: ../properties.c:965 ../properties.c:2054 ../properties.c:2362 +#: ../properties.c:2465 ../properties.c:2862 ../properties.c:3312 +#: ../properties.c:3522 ../properties.c:3727 ../properties.c:3885 msgid "Horizontal padding" msgstr "" @@ -410,9 +410,9 @@ msgid "" "border of the panel and the elements inside." msgstr "" -#: ../properties.c:980 ../properties.c:2060 ../properties.c:2369 -#: ../properties.c:2472 ../properties.c:2868 ../properties.c:3318 -#: ../properties.c:3529 ../properties.c:3733 ../properties.c:3891 +#: ../properties.c:980 ../properties.c:2068 ../properties.c:2377 +#: ../properties.c:2480 ../properties.c:2876 ../properties.c:3326 +#: ../properties.c:3537 ../properties.c:3741 ../properties.c:3899 msgid "Vertical padding" msgstr "" @@ -422,8 +422,8 @@ msgid "" "border of the panel and the elements inside." msgstr "" -#: ../properties.c:995 ../properties.c:2074 ../properties.c:2384 -#: ../properties.c:2882 ../properties.c:3544 +#: ../properties.c:995 ../properties.c:2082 ../properties.c:2392 +#: ../properties.c:2890 ../properties.c:3552 msgid "Spacing" msgstr "" @@ -473,8 +473,8 @@ msgid "" "enters the panel." msgstr "" -#: ../properties.c:1078 ../properties.c:1112 ../properties.c:3823 -#: ../properties.c:3842 +#: ../properties.c:1078 ../properties.c:1112 ../properties.c:3831 +#: ../properties.c:3850 msgid "seconds" msgstr "" @@ -592,95 +592,99 @@ msgid "" "compositor." msgstr "" -#: ../properties.c:1278 +#: ../properties.c:1268 ../properties.c:1451 +msgid "Free space" +msgstr "" + +#: ../properties.c:1283 msgid "" "Specifies the elements that will appear in the panel and their order. " "Elements can be added by selecting them in the list of available elements, " "then clicking on the add left button." msgstr "" -#: ../properties.c:1294 +#: ../properties.c:1299 msgid "" "Lists all the possible elements that can appear in the panel. Elements can " "be added to the panel by selecting them, then clicking on the add left " "button." msgstr "" -#: ../properties.c:1304 +#: ../properties.c:1309 msgid "Elements selected" msgstr "" -#: ../properties.c:1310 +#: ../properties.c:1315 msgid "Elements available" msgstr "" -#: ../properties.c:1327 +#: ../properties.c:1332 msgid "Moves up the current element in the list of selected elements." msgstr "" -#: ../properties.c:1335 +#: ../properties.c:1340 msgid "Moves down the current element in the list of selected elements." msgstr "" -#: ../properties.c:1337 ../properties.c:1976 +#: ../properties.c:1342 ../properties.c:1984 msgid " " msgstr "" -#: ../properties.c:1348 +#: ../properties.c:1353 msgid "" "Copies the current element in the list of available elements to the list of " "selected elements." msgstr "" -#: ../properties.c:1356 +#: ../properties.c:1361 msgid "Removes the current element from the list of selected elements." msgstr "" -#: ../properties.c:1909 +#: ../properties.c:1917 msgid "" "Specifies the application launchers that will appear in the launcher and " "their order. Launchers can be added by selecting an item in the list of " "available applications, then clicking on the add left button." msgstr "" -#: ../properties.c:1930 +#: ../properties.c:1938 msgid "" "Lists all the applications detected on the system. Launchers can be added to " "the launcher by selecting an application, then clicking on the add left " "button." msgstr "" -#: ../properties.c:1943 +#: ../properties.c:1951 msgid "Applications selected" msgstr "" -#: ../properties.c:1949 +#: ../properties.c:1957 msgid "Applications available" msgstr "" -#: ../properties.c:1966 +#: ../properties.c:1974 msgid "Moves up the current launcher in the list of selected applications." msgstr "" -#: ../properties.c:1974 +#: ../properties.c:1982 msgid "Moves down the current launcher in the list of selected applications." msgstr "" -#: ../properties.c:1987 +#: ../properties.c:1995 msgid "" "Copies the current application in the list of available applications to the " "list of selected applications." msgstr "" -#: ../properties.c:1995 +#: ../properties.c:2003 msgid "Removes the current application from the list of selected application." msgstr "" -#: ../properties.c:2007 +#: ../properties.c:2015 msgid "Additional application directories" msgstr "" -#: ../properties.c:2016 +#: ../properties.c:2024 msgid "" "Specifies a path to a directory from which the launcher is loading all ." "desktop files (all subdirectories are explored recursively). Can be used " @@ -688,86 +692,86 @@ msgid "" "~ is expaned to the path of the user's home directory." msgstr "" -#: ../properties.c:2042 +#: ../properties.c:2050 msgid "" "Selects the background used to display the launcher. Backgrounds can be " "edited in the Backgrounds tab." msgstr "" -#: ../properties.c:2056 +#: ../properties.c:2064 msgid "" "Specifies the horizontal padding of the launcher. This is the space between " "the border and the elements inside." msgstr "" -#: ../properties.c:2070 +#: ../properties.c:2078 msgid "" "Specifies the vertical padding of the launcher. This is the space between " "the border and the elements inside." msgstr "" -#: ../properties.c:2084 +#: ../properties.c:2092 msgid "Specifies the spacing between the elements inside the launcher." msgstr "" -#: ../properties.c:2087 ../properties.c:3558 +#: ../properties.c:2095 ../properties.c:3566 msgid "Icon size" msgstr "" -#: ../properties.c:2097 +#: ../properties.c:2105 msgid "Specifies the size of the launcher icons, in pixels." msgstr "" -#: ../properties.c:2101 ../properties.c:3078 ../properties.c:3572 +#: ../properties.c:2109 ../properties.c:3086 ../properties.c:3580 msgid "Icon opacity" msgstr "" -#: ../properties.c:2111 +#: ../properties.c:2119 msgid "Specifies the opacity of the launcher icons, in percent." msgstr "" -#: ../properties.c:2115 ../properties.c:3088 ../properties.c:3586 +#: ../properties.c:2123 ../properties.c:3096 ../properties.c:3594 msgid "Icon saturation" msgstr "" -#: ../properties.c:2125 +#: ../properties.c:2133 msgid "Specifies the saturation adjustment of the launcher icons, in percent." msgstr "" -#: ../properties.c:2129 ../properties.c:3098 ../properties.c:3600 +#: ../properties.c:2137 ../properties.c:3106 ../properties.c:3608 msgid "Icon brightness" msgstr "" -#: ../properties.c:2139 +#: ../properties.c:2147 msgid "Specifies the brightness adjustment of the launcher icons, in percent." msgstr "" -#: ../properties.c:2142 +#: ../properties.c:2150 msgid "Icon theme" msgstr "" -#: ../properties.c:2156 +#: ../properties.c:2164 msgid "" "The icon theme used to display launcher icons. If left blank, tint2 will " "detect and use the icon theme of your desktop as long as you have an " "XSETTINGS manager running (most desktop environments do)." msgstr "" -#: ../properties.c:2160 +#: ../properties.c:2168 msgid "Overrides XSETTINGS" msgstr "" -#: ../properties.c:2164 +#: ../properties.c:2172 msgid "" "If enabled, the icon theme selected here will override the one provided by " "XSETTINGS." msgstr "" -#: ../properties.c:2167 +#: ../properties.c:2175 msgid "Startup notifications" msgstr "" -#: ../properties.c:2177 +#: ../properties.c:2185 msgid "" "If enabled, startup notifications are shown when starting applications from " "the launcher. The appearance may vary depending on your desktop environment " @@ -775,78 +779,78 @@ msgid "" "application starts." msgstr "" -#: ../properties.c:2181 +#: ../properties.c:2189 msgid "Tooltips" msgstr "" -#: ../properties.c:2191 +#: ../properties.c:2199 msgid "" "If enabled, shows a tooltip with the application name when the mouse is " "moved over an application launcher." msgstr "" -#: ../properties.c:2228 ../properties.c:3427 +#: ../properties.c:2236 ../properties.c:3435 msgid "Options" msgstr "" -#: ../properties.c:2243 +#: ../properties.c:2251 msgid "Show a taskbar for each desktop" msgstr "" -#: ../properties.c:2253 +#: ../properties.c:2261 msgid "" "If enabled, the taskbar is split into multiple smaller taskbars, one for " "each virtual desktop." msgstr "" -#: ../properties.c:2257 +#: ../properties.c:2265 msgid "Distribute size between taskbars" msgstr "" -#: ../properties.c:2267 +#: ../properties.c:2275 msgid "" "If enabled and 'Show a taskbar for each desktop' is also enabled, the " "available size is distributed between taskbars proportionally to the number " "of tasks." msgstr "" -#: ../properties.c:2272 +#: ../properties.c:2280 msgid "Hide inactive tasks" msgstr "" -#: ../properties.c:2282 +#: ../properties.c:2290 msgid "If enabled, only the active task will be shown in the taskbar." msgstr "" -#: ../properties.c:2286 +#: ../properties.c:2294 msgid "Hide tasks from different monitors" msgstr "" -#: ../properties.c:2296 +#: ../properties.c:2304 msgid "" "If enabled, tasks that are not on the same monitor as the panel will not be " "displayed. This behavior is enabled automatically if the panel monitor is " "set to 'All'." msgstr "" -#: ../properties.c:2301 +#: ../properties.c:2309 msgid "Task sorting" msgstr "" -#: ../properties.c:2311 ../properties.c:2592 ../properties.c:2628 -#: ../properties.c:2664 ../properties.c:2700 ../properties.c:2736 +#: ../properties.c:2319 ../properties.c:2600 ../properties.c:2636 +#: ../properties.c:2672 ../properties.c:2708 ../properties.c:2744 msgid "None" msgstr "" -#: ../properties.c:2312 +#: ../properties.c:2320 msgid "By title" msgstr "" -#: ../properties.c:2313 +#: ../properties.c:2321 msgid "By center" msgstr "" -#: ../properties.c:2315 +#: ../properties.c:2323 msgid "" "Specifies how tasks should be sorted on the taskbar. \n" "'None' means that new tasks are added to the end, and the user can also " @@ -856,185 +860,185 @@ msgid "" "centers." msgstr "" -#: ../properties.c:2322 +#: ../properties.c:2330 msgid "Task alignment" msgstr "" -#: ../properties.c:2332 +#: ../properties.c:2340 msgid "Left" msgstr "" -#: ../properties.c:2333 +#: ../properties.c:2341 msgid "Center" msgstr "" -#: ../properties.c:2334 +#: ../properties.c:2342 msgid "Right" msgstr "" -#: ../properties.c:2336 +#: ../properties.c:2344 msgid "Specifies how tasks should be positioned on the taskbar." msgstr "" -#: ../properties.c:2364 +#: ../properties.c:2372 msgid "" "Specifies the horizontal padding of the taskbar. This is the space between " "the border and the elements inside." msgstr "" -#: ../properties.c:2379 +#: ../properties.c:2387 msgid "" "Specifies the vertical padding of the taskbar. This is the space between the " "border and the elements inside." msgstr "" -#: ../properties.c:2394 +#: ../properties.c:2402 msgid "Specifies the spacing between the elements inside the taskbar." msgstr "" -#: ../properties.c:2398 ../properties.c:2532 +#: ../properties.c:2406 ../properties.c:2540 msgid "Active background" msgstr "" -#: ../properties.c:2408 +#: ../properties.c:2416 msgid "" "Selects the background used to display the taskbar of the current desktop. " "Backgrounds can be edited in the Backgrounds tab." msgstr "" -#: ../properties.c:2412 ../properties.c:2547 +#: ../properties.c:2420 ../properties.c:2555 msgid "Inactive background" msgstr "" -#: ../properties.c:2422 +#: ../properties.c:2430 msgid "" "Selects the background used to display taskbars of inactive desktops. " "Backgrounds can be edited in the Backgrounds tab." msgstr "" -#: ../properties.c:2427 +#: ../properties.c:2435 msgid "Desktop name" msgstr "" -#: ../properties.c:2442 +#: ../properties.c:2450 msgid "Show desktop name" msgstr "" -#: ../properties.c:2452 +#: ../properties.c:2460 msgid "" "If enabled, displays the name of the desktop at the top/left of the taskbar. " "The name is set by your window manager; you might be able to configure it " "there." msgstr "" -#: ../properties.c:2467 +#: ../properties.c:2475 msgid "" "Specifies the horizontal padding of the desktop name. This is the space " "between the border and the text inside." msgstr "" -#: ../properties.c:2482 +#: ../properties.c:2490 msgid "" "Specifies the vertical padding of the desktop name. This is the space " "between the border and the text inside." msgstr "" -#: ../properties.c:2487 +#: ../properties.c:2495 msgid "Active font color" msgstr "" -#: ../properties.c:2498 +#: ../properties.c:2506 msgid "" "Specifies the font color used to display the name of the current desktop." msgstr "" -#: ../properties.c:2502 +#: ../properties.c:2510 msgid "Inactive font color" msgstr "" -#: ../properties.c:2513 +#: ../properties.c:2521 msgid "Specifies the font color used to display the name of inactive desktops." msgstr "" -#: ../properties.c:2517 ../properties.c:2895 ../properties.c:3905 +#: ../properties.c:2525 ../properties.c:2903 ../properties.c:3913 msgid "Font" msgstr "" -#: ../properties.c:2528 +#: ../properties.c:2536 msgid "Specifies the font used to display the desktop name." msgstr "" -#: ../properties.c:2542 +#: ../properties.c:2550 msgid "" "Selects the background used to display the name of the current desktop. " "Backgrounds can be edited in the Backgrounds tab." msgstr "" -#: ../properties.c:2557 +#: ../properties.c:2565 msgid "" "Selects the background used to display the name of inactive desktops. " "Backgrounds can be edited in the Backgrounds tab." msgstr "" -#: ../properties.c:2569 ../properties.c:3233 +#: ../properties.c:2577 ../properties.c:3241 msgid "Mouse events" msgstr "" -#: ../properties.c:2582 +#: ../properties.c:2590 msgid "Left click" msgstr "" -#: ../properties.c:2593 ../properties.c:2629 ../properties.c:2665 -#: ../properties.c:2701 ../properties.c:2737 -msgid "Close" -msgstr "" - -#: ../properties.c:2594 ../properties.c:2630 ../properties.c:2666 -#: ../properties.c:2702 ../properties.c:2738 -msgid "Toggle" -msgstr "" - -#: ../properties.c:2595 ../properties.c:2631 ../properties.c:2667 -#: ../properties.c:2703 ../properties.c:2739 -msgid "Iconify" -msgstr "" - -#: ../properties.c:2596 ../properties.c:2632 ../properties.c:2704 -#: ../properties.c:2740 -msgid "Shade" -msgstr "" - -#: ../properties.c:2597 ../properties.c:2633 ../properties.c:2669 -#: ../properties.c:2705 ../properties.c:2741 -msgid "Toggle or iconify" -msgstr "" - -#: ../properties.c:2598 ../properties.c:2634 ../properties.c:2670 -#: ../properties.c:2706 ../properties.c:2742 -msgid "Maximize or restore" -msgstr "" - -#: ../properties.c:2599 ../properties.c:2635 ../properties.c:2671 -#: ../properties.c:2707 ../properties.c:2743 -msgid "Desktop left" -msgstr "" - -#: ../properties.c:2600 ../properties.c:2636 ../properties.c:2672 -#: ../properties.c:2708 ../properties.c:2744 -msgid "Desktop right" -msgstr "" - #: ../properties.c:2601 ../properties.c:2637 ../properties.c:2673 #: ../properties.c:2709 ../properties.c:2745 -msgid "Next task" +msgid "Close" msgstr "" #: ../properties.c:2602 ../properties.c:2638 ../properties.c:2674 #: ../properties.c:2710 ../properties.c:2746 +msgid "Toggle" +msgstr "" + +#: ../properties.c:2603 ../properties.c:2639 ../properties.c:2675 +#: ../properties.c:2711 ../properties.c:2747 +msgid "Iconify" +msgstr "" + +#: ../properties.c:2604 ../properties.c:2640 ../properties.c:2712 +#: ../properties.c:2748 +msgid "Shade" +msgstr "" + +#: ../properties.c:2605 ../properties.c:2641 ../properties.c:2677 +#: ../properties.c:2713 ../properties.c:2749 +msgid "Toggle or iconify" +msgstr "" + +#: ../properties.c:2606 ../properties.c:2642 ../properties.c:2678 +#: ../properties.c:2714 ../properties.c:2750 +msgid "Maximize or restore" +msgstr "" + +#: ../properties.c:2607 ../properties.c:2643 ../properties.c:2679 +#: ../properties.c:2715 ../properties.c:2751 +msgid "Desktop left" +msgstr "" + +#: ../properties.c:2608 ../properties.c:2644 ../properties.c:2680 +#: ../properties.c:2716 ../properties.c:2752 +msgid "Desktop right" +msgstr "" + +#: ../properties.c:2609 ../properties.c:2645 ../properties.c:2681 +#: ../properties.c:2717 ../properties.c:2753 +msgid "Next task" +msgstr "" + +#: ../properties.c:2610 ../properties.c:2646 ../properties.c:2682 +#: ../properties.c:2718 ../properties.c:2754 msgid "Previous task" msgstr "" -#: ../properties.c:2604 +#: ../properties.c:2612 msgid "" "Specifies the action performed when task buttons receive a left click " "event: \n" @@ -1051,11 +1055,11 @@ msgid "" "'Previous task' sends the focus to the previous task." msgstr "" -#: ../properties.c:2618 +#: ../properties.c:2626 msgid "Wheel scroll up" msgstr "" -#: ../properties.c:2640 +#: ../properties.c:2648 msgid "" "Specifies the action performed when task buttons receive a scroll up " "event: \n" @@ -1072,15 +1076,15 @@ msgid "" "'Previous task' sends the focus to the previous task." msgstr "" -#: ../properties.c:2654 +#: ../properties.c:2662 msgid "Middle click" msgstr "" -#: ../properties.c:2668 +#: ../properties.c:2676 msgid "sShade" msgstr "" -#: ../properties.c:2676 +#: ../properties.c:2684 msgid "" "Specifies the action performed when task buttons receive a middle click " "event: \n" @@ -1097,11 +1101,11 @@ msgid "" "'Previous task' sends the focus to the previous task." msgstr "" -#: ../properties.c:2690 +#: ../properties.c:2698 msgid "Wheel scroll down" msgstr "" -#: ../properties.c:2712 +#: ../properties.c:2720 msgid "" "Specifies the action performed when task buttons receive a scroll down " "event: \n" @@ -1118,11 +1122,11 @@ msgid "" "'Previous task' sends the focus to the previous task." msgstr "" -#: ../properties.c:2726 +#: ../properties.c:2734 msgid "Right click" msgstr "" -#: ../properties.c:2748 +#: ../properties.c:2756 msgid "" "Specifies the action performed when task buttons receive a right click " "event: \n" @@ -1139,299 +1143,299 @@ msgid "" "'Previous task' sends the focus to the previous task." msgstr "" -#: ../properties.c:2776 +#: ../properties.c:2784 msgid "Show icon" msgstr "" -#: ../properties.c:2786 +#: ../properties.c:2794 msgid "If enabled, the window icon is shown on task buttons." msgstr "" -#: ../properties.c:2789 +#: ../properties.c:2797 msgid "Show text" msgstr "" -#: ../properties.c:2799 +#: ../properties.c:2807 msgid "If enabled, the window title is shown on task buttons." msgstr "" -#: ../properties.c:2802 +#: ../properties.c:2810 msgid "Center text" msgstr "" -#: ../properties.c:2812 +#: ../properties.c:2820 msgid "" "If enabled, the text is centered on task buttons. Otherwise, it is left-" "aligned." msgstr "" -#: ../properties.c:2815 +#: ../properties.c:2823 msgid "Show tooltips" msgstr "" -#: ../properties.c:2825 +#: ../properties.c:2833 msgid "" "If enabled, a tooltip showing the window title is displayed when the mouse " "cursor moves over task buttons." msgstr "" -#: ../properties.c:2828 +#: ../properties.c:2836 msgid "Maximum width" msgstr "" -#: ../properties.c:2838 +#: ../properties.c:2846 msgid "Specifies the maximum width of the task buttons." msgstr "" -#: ../properties.c:2841 +#: ../properties.c:2849 msgid "Maximum height" msgstr "" -#: ../properties.c:2851 +#: ../properties.c:2859 msgid "Specifies the maximum height of the task buttons." msgstr "" -#: ../properties.c:2864 +#: ../properties.c:2872 msgid "" "Specifies the horizontal padding of the task buttons. This is the space " "between the border and the content inside." msgstr "" -#: ../properties.c:2878 +#: ../properties.c:2886 msgid "" "Specifies the vertical padding of the task buttons. This is the space " "between the border and the content inside." msgstr "" -#: ../properties.c:2892 +#: ../properties.c:2900 msgid "Specifies the spacing between the icon and the text." msgstr "" -#: ../properties.c:2906 +#: ../properties.c:2914 msgid "Specifies the font used to display the task button text." msgstr "" -#: ../properties.c:2916 +#: ../properties.c:2924 msgid "Default style" msgstr "" -#: ../properties.c:2926 +#: ../properties.c:2934 msgid "Normal task" msgstr "" -#: ../properties.c:2936 +#: ../properties.c:2944 msgid "Active task" msgstr "" -#: ../properties.c:2946 +#: ../properties.c:2954 msgid "Urgent task" msgstr "" -#: ../properties.c:2956 +#: ../properties.c:2964 msgid "Iconified task" msgstr "" -#: ../properties.c:3059 +#: ../properties.c:3067 msgid "If enabled, a custom font color is used to display the task text." msgstr "" -#: ../properties.c:3061 ../properties.c:3360 ../properties.c:3775 -#: ../properties.c:3919 +#: ../properties.c:3069 ../properties.c:3368 ../properties.c:3783 +#: ../properties.c:3927 msgid "Font color" msgstr "" -#: ../properties.c:3070 +#: ../properties.c:3078 msgid "Specifies the font color used to display the task text." msgstr "" -#: ../properties.c:3076 +#: ../properties.c:3084 msgid "" "If enabled, a custom opacity/saturation/brightness is used to display the " "task icon." msgstr "" -#: ../properties.c:3086 +#: ../properties.c:3094 msgid "Specifies the opacity (in %) used to display the task icon." msgstr "" -#: ../properties.c:3096 +#: ../properties.c:3104 msgid "" "Specifies the saturation adjustment (in %) used to display the task icon." msgstr "" -#: ../properties.c:3106 +#: ../properties.c:3114 msgid "" "Specifies the brightness adjustment (in %) used to display the task icon." msgstr "" -#: ../properties.c:3112 +#: ../properties.c:3120 msgid "If enabled, a custom background is used to display the task." msgstr "" -#: ../properties.c:3122 +#: ../properties.c:3130 msgid "" "Selects the background used to display the task. Backgrounds can be edited " "in the Backgrounds tab." msgstr "" -#: ../properties.c:3126 +#: ../properties.c:3134 msgid "Blinks" msgstr "" -#: ../properties.c:3134 +#: ../properties.c:3142 msgid "Specifies how many times urgent tasks blink." msgstr "" -#: ../properties.c:3156 +#: ../properties.c:3164 msgid "Format" msgstr "" -#: ../properties.c:3168 +#: ../properties.c:3176 msgid "First line format" msgstr "" -#: ../properties.c:3180 +#: ../properties.c:3188 msgid "" "Specifies the format used to display the first line of the clock text. See " "'man strftime' for all the available options." msgstr "" -#: ../properties.c:3184 +#: ../properties.c:3192 msgid "Second line format" msgstr "" -#: ../properties.c:3196 +#: ../properties.c:3204 msgid "" "Specifies the format used to display the second line of the clock text. See " "'man strftime' for all the available options." msgstr "" -#: ../properties.c:3200 +#: ../properties.c:3208 msgid "First line timezone" msgstr "" -#: ../properties.c:3212 +#: ../properties.c:3220 msgid "" "Specifies the timezone used to display the first line of the clock text. If " "empty, the current timezone is used. Otherwise, it must be set to a valid " "value of the TZ environment variable." msgstr "" -#: ../properties.c:3216 +#: ../properties.c:3224 msgid "Second line timezone" msgstr "" -#: ../properties.c:3228 +#: ../properties.c:3236 msgid "" "Specifies the timezone used to display the second line of the clock text. If " "empty, the current timezone is used. Otherwise, it must be set to a valid " "value of the TZ environment variable." msgstr "" -#: ../properties.c:3246 +#: ../properties.c:3254 msgid "Left click command" msgstr "" -#: ../properties.c:3258 +#: ../properties.c:3266 msgid "" "Specifies a command that will be executed when the clock receives a left " "click." msgstr "" -#: ../properties.c:3261 +#: ../properties.c:3269 msgid "Right click command" msgstr "" -#: ../properties.c:3273 +#: ../properties.c:3281 msgid "" "Specifies a command that will be executed when the clock receives a right " "click." msgstr "" -#: ../properties.c:3300 +#: ../properties.c:3308 msgid "" "Selects the background used to display the clock. Backgrounds can be edited " "in the Backgrounds tab." msgstr "" -#: ../properties.c:3314 +#: ../properties.c:3322 msgid "" "Specifies the horizontal padding of the clock. This is the space between the " "border and the content inside." msgstr "" -#: ../properties.c:3328 +#: ../properties.c:3336 msgid "" "Specifies the vertical padding of the clock. This is the space between the " "border and the content inside." msgstr "" -#: ../properties.c:3332 ../properties.c:3747 +#: ../properties.c:3340 ../properties.c:3755 msgid "Font first line" msgstr "" -#: ../properties.c:3343 +#: ../properties.c:3351 msgid "Specifies the font used to display the first line of the clock." msgstr "" -#: ../properties.c:3346 ../properties.c:3761 +#: ../properties.c:3354 ../properties.c:3769 msgid "Font second line" msgstr "" -#: ../properties.c:3357 +#: ../properties.c:3365 msgid "Specifies the font used to display the second line of the clock." msgstr "" -#: ../properties.c:3371 +#: ../properties.c:3379 msgid "Specifies the font color used to display the clock." msgstr "" -#: ../properties.c:3375 +#: ../properties.c:3383 msgid "Tooltip" msgstr "" -#: ../properties.c:3388 +#: ../properties.c:3396 msgid "Format" msgstr "" -#: ../properties.c:3399 +#: ../properties.c:3407 msgid "" "Specifies the format used to display the clock tooltip. See 'man strftime' " "for the available options." msgstr "" -#: ../properties.c:3403 +#: ../properties.c:3411 msgid "Timezone" msgstr "" -#: ../properties.c:3414 +#: ../properties.c:3422 msgid "" "Specifies the timezone used to display the clock tooltip. If empty, the " "current timezone is used. Otherwise, it must be set to a valid value of the " "TZ environment variable." msgstr "" -#: ../properties.c:3441 +#: ../properties.c:3449 msgid "Icon ordering" msgstr "" -#: ../properties.c:3451 +#: ../properties.c:3459 msgid "Ascending" msgstr "" -#: ../properties.c:3452 +#: ../properties.c:3460 msgid "Descending" msgstr "" -#: ../properties.c:3453 +#: ../properties.c:3461 msgid "Left to right" msgstr "" -#: ../properties.c:3454 +#: ../properties.c:3462 msgid "Right to left" msgstr "" -#: ../properties.c:3456 +#: ../properties.c:3464 msgid "" "Specifies the order used to arrange the system tray icons. \n" "'Ascending' means that icons are sorted in ascending order of their window " @@ -1442,162 +1446,162 @@ msgid "" "'Right to left' means that icons are always added to the right." msgstr "" -#: ../properties.c:3481 +#: ../properties.c:3489 msgid "" "Specifies the monitor on which to place the system tray. Due to technical " "limitations, the system tray cannot be displayed on multiple monitors." msgstr "" -#: ../properties.c:3509 +#: ../properties.c:3517 msgid "" "Selects the background used to display the system tray. Backgrounds can be " "edited in the Backgrounds tab." msgstr "" -#: ../properties.c:3524 +#: ../properties.c:3532 msgid "" "Specifies the horizontal padding of the system tray. This is the space " "between the border and the content inside." msgstr "" -#: ../properties.c:3539 +#: ../properties.c:3547 msgid "" "Specifies the vertical padding of the system tray. This is the space between " "the border and the content inside." msgstr "" -#: ../properties.c:3554 +#: ../properties.c:3562 msgid "Specifies the spacing between system tray icons." msgstr "" -#: ../properties.c:3568 +#: ../properties.c:3576 msgid "Specifies the size of the system tray icons, in pixels." msgstr "" -#: ../properties.c:3582 +#: ../properties.c:3590 msgid "Specifies the opacity of the system tray icons, in percent." msgstr "" -#: ../properties.c:3596 +#: ../properties.c:3604 msgid "" "Specifies the saturation adjustment of the system tray icons, in percent." msgstr "" -#: ../properties.c:3610 +#: ../properties.c:3618 msgid "" "Specifies the brightness adjustment of the system tray icons, in percent." msgstr "" -#: ../properties.c:3626 +#: ../properties.c:3634 msgid "Thresholds" msgstr "" -#: ../properties.c:3639 +#: ../properties.c:3647 msgid "Hide if charge higher than" msgstr "" -#: ../properties.c:3649 +#: ../properties.c:3657 msgid "" "Minimum battery level for which to hide the batter applet. Use 101 to always " "show the batter applet." msgstr "" -#: ../properties.c:3651 ../properties.c:3670 +#: ../properties.c:3659 ../properties.c:3678 msgid "%" msgstr "" -#: ../properties.c:3658 +#: ../properties.c:3666 msgid "Alert if charge lower than" msgstr "" -#: ../properties.c:3668 +#: ../properties.c:3676 msgid "Battery level for which to display an alert." msgstr "" -#: ../properties.c:3677 +#: ../properties.c:3685 msgid "Alert command" msgstr "" -#: ../properties.c:3688 +#: ../properties.c:3696 msgid "Command to be executed when the alert threshold is reached." msgstr "" -#: ../properties.c:3715 +#: ../properties.c:3723 msgid "" "Selects the background used to display the battery. Backgrounds can be " "edited in the Backgrounds tab." msgstr "" -#: ../properties.c:3729 +#: ../properties.c:3737 msgid "" "Specifies the horizontal padding of the battery. This is the space between " "the border and the content inside." msgstr "" -#: ../properties.c:3743 +#: ../properties.c:3751 msgid "" "Specifies the vertical padding of the battery. This is the space between the " "border and the content inside." msgstr "" -#: ../properties.c:3758 +#: ../properties.c:3766 msgid "Specifies the font used to display the first line of the battery text." msgstr "" -#: ../properties.c:3772 +#: ../properties.c:3780 msgid "Specifies the font used to display the second line of the battery text." msgstr "" -#: ../properties.c:3786 +#: ../properties.c:3794 msgid "Specifies the font clor used to display the battery text." msgstr "" -#: ../properties.c:3798 +#: ../properties.c:3806 msgid "Timing" msgstr "" -#: ../properties.c:3811 +#: ../properties.c:3819 msgid "Show delay" msgstr "" -#: ../properties.c:3821 +#: ../properties.c:3829 msgid "" "Specifies a delay after which to show the tooltip when moving the mouse over " "an element." msgstr "" -#: ../properties.c:3830 +#: ../properties.c:3838 msgid "Hide delay" msgstr "" -#: ../properties.c:3839 +#: ../properties.c:3847 msgid "" "Specifies a delay after which to hide the tooltip when moving the mouse " "outside an element." msgstr "" -#: ../properties.c:3873 +#: ../properties.c:3881 msgid "" "Selects the background used to display the tooltip. Backgrounds can be " "edited in the Backgrounds tab." msgstr "" -#: ../properties.c:3887 +#: ../properties.c:3895 msgid "" "Specifies the horizontal padding of the tooltip. This is the space between " "the border and the content inside." msgstr "" -#: ../properties.c:3901 +#: ../properties.c:3909 msgid "" "Specifies the vertical padding of the tooltip. This is the space between the " "border and the content inside." msgstr "" -#: ../properties.c:3916 +#: ../properties.c:3924 msgid "Specifies the font used to display the text of the tooltip." msgstr "" -#: ../properties.c:3930 +#: ../properties.c:3938 msgid "Specifies the font color used to display the text of the tooltip." msgstr "" diff --git a/src/tint2conf/properties.c b/src/tint2conf/properties.c index ab47b73..a2726b4 100644 --- a/src/tint2conf/properties.c +++ b/src/tint2conf/properties.c @@ -1263,6 +1263,11 @@ void create_panel_items(GtkWidget *parent) itemsColName, _("Launcher"), itemsColValue, "L", -1); + gtk_list_store_append(all_items, &iter); + gtk_list_store_set(all_items, &iter, + itemsColName, _("Free space"), + itemsColValue, "F", + -1); panel_items_view = gtk_tree_view_new(); gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(panel_items_view), @@ -1441,6 +1446,9 @@ void set_panel_items(const char *items) } else if (v == 'L') { value = "L"; name = _("Launcher"); + } else if (v == 'F') { + value = "F"; + name = _("Free space"); } else { continue; }