On 07.09.2012 05:01, Rodolfo Granata wrote: > Hey Markus, > > * Added wbar.png back > * Updated make-conf.sh to take multiple search directories > * I wanna keep the font even though it may not exist, if I'm not > mistaken, wbar will start anyway and it will get a default if it does. > * Added your latest patches. > * removed the debian dir. > > TODO: promote wbar-config. > Hi Rodolfo, thank you! I think i'm really done now. We need a new release. :) I've updated the README and added some paragraphs about wbar-config and make-conf.sh and removed some old lines and cleaned up a little. Patch is attached, let me know what you think about it. Forget about my suggestion to reintroduce the old icons. Although i know about the original authors now, it is much easier if i handle a default configuration by myself within the Debian system. It also makes the source package of wbar smaller and easier to maintain if you don't have to bother with external ressources. I've checked the fonts again and indeed, it seems wbar will start anyway even without a correct font path. Done! I've discovered another typo in wbar-config (licence -> license) and the version of wbar-config should be updated to 2.3.2 for your next release) And it was necessary to patch Makefile.am in the pixmaps folder to copy wbar.png to the right place again. Patch is attached. Last but not least: The COPYING file states that Wbar is licensed under the GPL-2+ (the + is important) which means you grant everyone the right to redistribute and modify wbar either under the GPL-2 or any later version. I personally think that's a good idea, but i wanted to ask again if that's your intention. If yes, great, no changes are needed but i guess you should change the license on the official homepage, too. That's all for now Regards Markus
--- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -5,8 +5,7 @@ pixmapsdir = @PIXMAPDIR@/@PACKAGE_NAME@ pixmaps_DATA = $(IMAGES) IMAGES = \ -dock.png +dock.png \ +wbar.png -pixmapdir = @PIXMAPDIR@ -#pixmap_DATA = wbar.png
--- a/po/de.po
+++ b/po/de.po
@@ -2,7 +2,6 @@
# Copyright (C) YEAR ORGANIZATION
# Yadickson Soto <yadickson@gmail.com>, 2009.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: wbar 2.0.0\n"
@@ -213,7 +212,7 @@ msgstr "Ã?ber"
msgid "wbar config"
msgstr "Wbar config"
-msgid "Licence GPL - 2010"
+msgid "License GPL - 2010"
msgstr "Lizenz GPL - 2010"
msgid "A light and fast launch bar."
@@ -348,14 +347,12 @@ msgstr "Fehlerprotokoll speichern: "
#~ msgid "Warlock Bar"
#~ msgstr "Warlock Bar"
-#, fuzzy
#~ msgid "Icon name:"
#~ msgstr "Symbol:"
#~ msgid "_Settings"
#~ msgstr "_Einstellungen"
-#, fuzzy
#~ msgid "Font size:"
#~ msgstr "Symbolgrö�e"
--- a/po/es.po
+++ b/po/es.po
@@ -214,7 +214,7 @@ msgstr "Acerca de"
msgid "wbar config"
msgstr "configuración wbar"
-msgid "Licence GPL - 2010"
+msgid "License GPL - 2010"
msgstr "Licencia GPL - 2010"
msgid "A light and fast launch bar."
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,7 +2,6 @@
# Copyright (C) YEAR ORGANIZATION
# Yadickson Soto <yadickson@gmail.com>, 2009.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: wbar 2.0.0\n"
@@ -214,7 +213,7 @@ msgstr "Tietoa"
msgid "wbar config"
msgstr ""
-msgid "Licence GPL - 2010"
+msgid "License GPL - 2010"
msgstr ""
msgid "A light and fast launch bar."
@@ -346,14 +345,12 @@ msgstr ""
msgid "Error copy file: "
msgstr ""
-#, fuzzy
#~ msgid "Icon name:"
#~ msgstr "Kuvake:"
#~ msgid "_Settings"
#~ msgstr "_Asetukset"
-#, fuzzy
#~ msgid "Font size:"
#~ msgstr "Kuvakkeen koko"
--- a/src/config/Functions.cc
+++ b/src/config/Functions.cc
@@ -1393,7 +1393,7 @@ void show_about()
"icon", pixbuf,
"program-name", _("wbar config"),
"version", VERSION,
- "copyright", _("Licence GPL - 2010"),
+ "copyright", _("License GPL - 2010"),
"comments", _("A light and fast launch bar."),
"website", "http://code.google.com/p/wbar/";,
"website-label", _("wbar project website"),
--- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl make yadickson soto -AC_INIT([wbar], [2.3.0]) +AC_INIT([wbar], [2.3.2]) AM_INIT_AUTOMAKE([ filename-length-max=256 tar-ustar ]) AM_CONFIG_HEADER(config.h)
--- a/README
+++ b/README
@@ -2,43 +2,61 @@
wbar
===================
+SUMMARY
+
+1. License
+2. Dependencies
+3. General
+4. Installation
+5. Configuration
+ 5.1. Wbar-config (recommended)
+ 5.2. make-conf.sh
+ 5.3. Manual method
+6. Bugs
+
+--------------------
+
+1. LICENSE
+----------
+
Wbar by Rodolfo Granata Copyright (C) 2012
warlock.cc@gmail.com
-Wbar and wbar-config by Yadickson Soto Copyright (C) 2010
+Wbar and wbar-config by Yadickson Soto Copyright (C) 2010
yadickson@gmail.com
-LICENSE
-
-Wbar is under GNU GPL license. Please, read the 'COPYING' to know what this means.
+Wbar is under GNU GPL license. Please, read the 'COPYING' to know what this
+means.
-It'll be greatly appreciated if you mail the author (warlock) telling about any changes,
-patches, recomendations, etc.
+It'll be greatly appreciated if you mail the author (warlock) telling about
+any changes, patches, recommendations, etc.
Thanks
-Dependencies:
--------------
+2. DEPENDENCIES
+---------------
+
libimlib2-dev, intltool, pkg-config, libglade2-dev, libgtk2.0-dev, libx11-dev
-General:
---------
-wbar is a quick launch bar. Its fast, light and cool eye-candy.
+3. GENERAL
+----------
+
+Wbar is a quick launch bar. It's fast, light and cool eye-candy.
-Its hacked in c++ trying to keep code as readable as possible
-with out sacrificing speed. It works directly on top of X to avoid
-going throug a lot of layers.
+It's hacked in c++ trying to keep code as readable as possible
+without sacrificing speed. It works directly on top of X to avoid
+going through a lot of layers.
-Initially developed for Fluxbox, then tested on WindowMaker, Xfce,
-Gnome, etc.
+Initially it was developed for Fluxbox, then tested on WindowMaker, Xfce,
+and Gnome 2 and it works very well with other window managers, too.
-Since version 1.0 can run on top of desktops such as xfdesktop
-or nautilus with the -above-desk switch.
+Since version 1.0 Wbar can run on top of desktops such as xfdesktop
+or Nautilus with the -above-desk switch.
-Installing: (for the impacient)
------------
+4. INSTALLATION (for the impatient)
+---------------
$ ./configure --prefix=/usr --exec_prefix=/usr --sysconfdir=/etc
@@ -53,36 +71,38 @@ As root
$ wbar -help (this gives you important options)
-Now wbar should work out of the box(, but again ... may be not).
-Notes:
-------
-* If you're getting window decorations (you shouldn't) when you start
- your window manager because you're using the -above-desk switch,
- try to give the WM some time to start up before wbar does.
+5. CONFIGURATION
+----------------
- Example (in your startup script): (sleep 5s && wbar) &
- Note that the parenthesis surrounding the command are important.
+5.1. Wbar-config
-Fonts:
-------
-Font support is new. Its used to display text below the icons.
-To change font color / shadow / position you'll have
-to hack into the code which shouldn't be dificult at all.
-TODO: Fix wide labels, chopped when rendering as vertical bar.
+Wbar-config is the recommended tool to customize Wbar. It is completely
+optional but very easy to use. You can tweak the icon size and distance, adjust Wbar's
+position on the screen and also change effects like transparency, color filter and
+jump factor. See also wbar(1) and wbar-config(1).
+
+5.2. make-conf.sh
+
+If you don't want to install a GUI application to configure Wbar, the
+next best solution to create an initial wbar.cfg would be the make-conf.sh script.
+The script searches for installed desktop files in /usr/share/applications and
+creates an initial config in /tmp with the corresponding icons in your pixmaps
+and hicolor directories in /usr/share. Just copy the config file to ~/.wbar and
+you're set.
-Configuration file:
--------------------
-If not supplied $HOME/.wbar will be tried,
-else /etc/default/wbar/wbar.cfg
+5.3. Manual method
+
+Wbar will look for your configuration in $HOME/.wbar first or will use the global
+configuration file in /etc/wbar.d/wbar.cfg.
.wbar format:
---------------
Commented lines start whith #.
Blank lines are ignored.
-Example:
+Example:
Each icon has the following format:
@@ -95,35 +115,36 @@ appear. If you aren't gonna display text
for a certain icon you should do the following:
i: <icon-file-path>
-c:
-t:
+c:
+t:
The first icon definition has a special meaning:
------------------------------------------------
i: <path-to-the-bar-background-image>
-c: wbar --bpress --above-desk --vbar --pos right --isize 32 --idist 5 --nanim 4 --falfa 65
+c: wbar --bpress --above-desk --vbar --pos right --isize 64 --idist 5 --nanim 4 --falfa 65
t: <path-to-font-to-display-text-with/size>
IF A FONT ISN'T SUPPLIED THEN NO TEXT RENDERING IS DONE.
*******************
-Filters:
---------
--fc set the filter color which is applied to icons.
-The format is 0xAARRGGBB
-
--filter controls where to apply filter
-0: dont apply
-1: apply to hovered icon
-2: apply to all but hovered
-3: all
+Notes:
+------
+If you're getting window decorations (you shouldn't) when you start
+your window manager because you're using the -above-desk switch,
+try to give the WM some time to start up before wbar does.
-experiment with other options.
+Example (in your startup script): (sleep 5s && wbar) &
+Note that the parenthesis surrounding the command are important.
-BUGS:
+
+BUGS
----
-Use the issue tracker :-)
+
+Use the issue tracker. :-)
Fix them man! I need a hand to keep this alive.
+
+
+
Attachment:
signature.asc
Description: OpenPGP digital signature