Merge branch 'doc-fixes' into 'master'
Doc fixes Hi o9000, thanks for resurrecting tint2! Here are some purely "bureaucratic" fixes: I fixed some typo's, updated URLs, and cleaned up a few files. See merge request !4
This commit is contained in:
commit
093963dadd
7 changed files with 16 additions and 21 deletions
|
@ -23,7 +23,7 @@ pkg_check_modules( SN libstartup-notification-1.0>=0.12 )
|
|||
find_library( RT_LIBRARY rt )
|
||||
|
||||
if( NOT X11_FOUND OR NOT PANGOCAIRO_FOUND OR NOT PANGO_FOUND OR NOT CAIRO_FOUND OR NOT GLIB2_FOUND OR NOT GOBJECT2_FOUND OR NOT IMLIB2_FOUND )
|
||||
message( FATAL_ERROR "Not all dependencies fulfilled. See https://code.google.com/p/tint2/wiki/Install" )
|
||||
message( FATAL_ERROR "Not all dependencies fulfilled. See https://gitlab.com/o9000/tint2/wikis/Install" )
|
||||
endif( NOT X11_FOUND OR NOT PANGOCAIRO_FOUND OR NOT PANGO_FOUND OR NOT CAIRO_FOUND OR NOT GLIB2_FOUND OR NOT GOBJECT2_FOUND OR NOT IMLIB2_FOUND )
|
||||
|
||||
string( REPLACE ";" " " FLAGS_REPLACED "${IMLIB2_LDFLAGS}" )
|
||||
|
@ -42,7 +42,7 @@ include_directories( ${PROJECT_BINARY_DIR}
|
|||
src/launcher
|
||||
src/tooltip
|
||||
src/util
|
||||
src/freespace
|
||||
src/freespace
|
||||
${X11_INCLUDE_DIRS}
|
||||
${PANGOCAIRO_INCLUDE_DIRS}
|
||||
${PANGO_INCLUDE_DIRS}
|
||||
|
@ -68,8 +68,8 @@ set( SOURCES src/config.c
|
|||
src/taskbar/taskbar.c
|
||||
src/taskbar/taskbarname.c
|
||||
src/tooltip/tooltip.c
|
||||
src/freespace/freespace.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
|
||||
|
|
|
@ -7,5 +7,4 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr ../
|
|||
make
|
||||
sudo make install
|
||||
|
||||
To see additional options you can do after the cmake step a 'cmake -L ../'
|
||||
|
||||
To see additional options you can set at the 'cmake' step, run 'cmake -L ../'
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
DEPENDENCIES:
|
||||
cairo (whit X support), pango, glib2, libX11, libXinerama, libXrandr, libXrender, libXcomposite, libXdamage imlib2 (with X support)
|
||||
you might need -dev packages on debian
|
||||
|
||||
cairo (with X support), pango, glib2, libX11, libXinerama, libXrandr, libXrender, libXcomposite, libXdamage, imlib2 (with X support)
|
||||
you might need -dev packages on Debian
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
.\" First parameter, NAME, should be all caps
|
||||
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
|
||||
.\" other parameters are allowed: see man(7), man(1)
|
||||
.TH TINT2 1 "2009-01-17"
|
||||
.TH TINT2 1 "2015-07-05"
|
||||
.\" Please adjust this date whenever revising the manpage.
|
||||
.\"
|
||||
.\" Some roff macros, for reference:
|
||||
|
@ -37,7 +37,7 @@ compliance with freedesktop specifications.
|
|||
.PP
|
||||
On the first startup tint2 creates a config file in $HOME/.config/tint2/tint2rc.
|
||||
.PP
|
||||
See wiki page on http://code.google.com/p/tint2/wiki/Welcome for more information.
|
||||
See the wiki page at https://gitlab.com/o9000/tint2/wikis/home for more information.
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
.B \-c config-file
|
||||
|
|
|
@ -549,7 +549,7 @@ void set_panel_properties(Panel *p)
|
|||
memset(&wmhints, 0, sizeof(wmhints));
|
||||
if (panel_dock) {
|
||||
// Necessary for placing the panel into the dock on Openbox and Fluxbox.
|
||||
// See https://code.google.com/p/tint2/issues/detail?id=465
|
||||
// See https://gitlab.com/o9000/tint2/issues/465
|
||||
wmhints.icon_window = wmhints.window_group = p->main_win;
|
||||
wmhints.flags = StateHint | IconWindowHint;
|
||||
wmhints.initial_state = WithdrawnState;
|
||||
|
|
|
@ -284,7 +284,7 @@ void get_monitors()
|
|||
if (res && res->ncrtc >= nbmonitor) {
|
||||
// use xrandr to identify monitors (does not work with proprietery nvidia drivers)
|
||||
|
||||
// Workaround for issue https://code.google.com/p/tint2/issues/detail?id=353
|
||||
// Workaround for issue https://gitlab.com/o9000/tint2/issues/353
|
||||
// on some recent configs, XRRGetScreenResourcesCurrent returns a fantom monitor at last position
|
||||
{
|
||||
int i = res->ncrtc - 1;
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
[Desktop Entry]
|
||||
Type=Application
|
||||
Encoding=UTF-8
|
||||
Name=Tint2 panel
|
||||
Name[am]=ፓነል tint2
|
||||
Name=tint2 panel
|
||||
Name[am]=ፓነል tint2
|
||||
Name[ar]=الشريط tint2
|
||||
Name[ast]=Panel tint2
|
||||
Name[be]=Панэль tint2
|
||||
|
@ -12,7 +12,7 @@ Name[da]=Panel tint2
|
|||
Name[de]=Leiste tint2
|
||||
Name[dz]=པེ་ནཱལ། tint2
|
||||
Name[el]=Ταμπλό tint2
|
||||
Name[en_GB]=Panel tint2
|
||||
Name[en]=tint2 panel
|
||||
Name[eo]=Panelo tint2
|
||||
Name[es]=Panel tint2
|
||||
Name[et]=Ääreriba tint2
|
||||
|
@ -36,7 +36,6 @@ Name[nn]=Panel tint2
|
|||
Name[pa]=ਪੈਨਲ tint2
|
||||
Name[pl]=Panel tint2
|
||||
Name[pt]=Painel tint2
|
||||
Name[pt_BR]=Painel tint2
|
||||
Name[ro]=Panou tint2
|
||||
Name[ru]=Панель tint2
|
||||
Name[si]=පුවරුව tint2
|
||||
|
@ -48,12 +47,10 @@ Name[tr]=Panel tint2
|
|||
Name[ug]=panel tint2
|
||||
Name[uk]=Панель tint2
|
||||
Name[ur]=پینل tint2
|
||||
Name[ur_PK]=پینل tint2
|
||||
Name[vi]=Panel tint2
|
||||
Name[zh_CN]=面板 tint2
|
||||
Name[zh_TW]=面板 tint2
|
||||
Name[zh]=面板 tint2
|
||||
Comment=Lightweight panel
|
||||
Comment[fr_FR]=Panel léger
|
||||
Comment[fr]=Panel léger
|
||||
Comment[pl]=Lekki panel
|
||||
Exec=tint2
|
||||
Icon=taskbar
|
||||
|
|
Loading…
Reference in a new issue