From 10f3fa6606a1dcd85056db16d39db315759cab2c Mon Sep 17 00:00:00 2001 From: Jesse van den Kieboom Date: Fri, 7 Apr 2006 16:43:16 +0000 Subject: [PATCH] ui/gm-world-properties.glade: added logging ui/gm-preferences.glade: added userlist data/Makefile.am: commented schema file data/gnoemoe.schemas.in: removed empty line po/nl.po: added translations po/POTFILES.in: added gm-mcp-vmoo-userlist scripts/run.rb: improved scripts by Paul van Tilburg --- ChangeLog | 6 + configure.ac | 1 + data/Makefile.am | 25 +- data/gnoemoe.schemas.in | 1 - po/POTFILES.in | 1 + po/nl.po | 346 ++++++++++++++++---------- scripts/run.rb | 152 ++++++++---- ui/gm-preferences.glade | 469 ++++++++++++++++++++++++++++++++++- ui/gm-world-properties.glade | 379 +++++++++++++++++++++++++++- 9 files changed, 1180 insertions(+), 200 deletions(-) diff --git a/ChangeLog b/ChangeLog index db01890..45a8e35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-07-04 Jesse van den Kieboom + * ui/gm-world-properties.glade: added logging + * ui/gm-preferences.glade: added userlist + * data/Makefile.am: commented schema file + * data/gnoemoe.schemas.in: removed empty line + 2006-07-04 Jesse van den Kieboom * gnoemoe/gm-app.c: added default userlist options, added default logging options diff --git a/configure.ac b/configure.ac index 8ac148a..3610832 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,7 @@ AM_PROG_LIBTOOL AC_PROG_INTLTOOL +# AC_PATH_PROG(GCONFTOOL, gconftool-2) AM_GCONF_SOURCE_2 AC_PROG_YACC diff --git a/data/Makefile.am b/data/Makefile.am index fa758cb..65c9262 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,21 +1,36 @@ -desktopdir = $(datadir)/applications +desktopdir = $(datadir)/applications desktop_in_files = gnoemoe.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ +# schemasdir = $(GCONF_SCHEMA_FILE_DIR) +# schemas_in_files = gnoemoe.schemas.in +# schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) +# @INTLTOOL_SCHEMAS_RULE@ + mimedir = $(datadir)/mime/packages mime_DATA = gnoemoe.xml langdir = $(datadir)/gtksourceview-1.0/language-specs lang_DATA = moo.lang +# if GCONF_SCHEMAS_INSTALL +# install-data-local: +# if test -z "$(DESTDIR)" ; then \ +# for p in $(schemas_DATA) ; do \ +# GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \ +# done \ +# fi +# else +# install-data-local: +# endif + EXTRA_DIST = \ $(desktop_in_files) \ +# $(schemas_in_files \ $(mime_DATA) \ $(lang_DATA) CLEANFILES = \ $(desktop_DATA) - - - +# $(schemas_DATA) diff --git a/data/gnoemoe.schemas.in b/data/gnoemoe.schemas.in index 1a776f5..dec9b0d 100644 --- a/data/gnoemoe.schemas.in +++ b/data/gnoemoe.schemas.in @@ -9,7 +9,6 @@ Enable url handler for moo:// scheme. Boolean options available, true enables gnoemoe to handle to moo:// scheme, false disables gnoemoe from handling moo:// scheme. - diff --git a/po/POTFILES.in b/po/POTFILES.in index 66aab8f..40559e4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -25,6 +25,7 @@ gnoemoe/widgets/gm-worlds-view.c gnoemoe/mcp/gm-mcp-userlist-view.c gnoemoe/mcp/gm-mcp-icecrew-userlist.c +gnoemoe/mcp/gm-mcp-vmoo-userlist.c gnoemoe/parser/parser.y diff --git a/po/nl.po b/po/nl.po index ddb0478..42b1597 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnoemoe 0.8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-01 02:12+0200\n" +"POT-Creation-Date: 2006-04-07 13:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Jesse van den Kieboom \n" "Language-Team: Dutch \n" @@ -48,18 +48,18 @@ msgid "Recover from previous session (used with gnome session)" msgstr "" "Herstel van de vorige opgeslagen sessie (wordt gebruikt door gnome sessies)" -#: ../gnoemoe/gm-app.c:488 +#: ../gnoemoe/gm-app.c:496 #, c-format msgid "" "GnoeMoe Application: there is no application directory, this is very bad!!!\n" msgstr "GnoeMoe Applicatie: er is geen applicatie map, dit is heel erg!!!\n" -#: ../gnoemoe/gm-app.c:520 +#: ../gnoemoe/gm-app.c:528 #, c-format msgid "Current version of GnoeMoe is %s\n" msgstr "Huidige versie van GnoeMoe is %s\n" -#: ../gnoemoe/gm-net.c:263 +#: ../gnoemoe/gm-net.c:263 ../gnoemoe/widgets/gm-world-view.c:846 #, c-format msgid "Connection lost... (%s)" msgstr "Connectie verloren... (%s)" @@ -109,22 +109,27 @@ msgstr "Script '%s' uit '%s' () uitvoeren" msgid "Registering functions from '%s'" msgstr "Functies registreren uit '%s'" -#: ../gnoemoe/gm-scripts.c:508 +#: ../gnoemoe/gm-scripts.c:509 +#, c-format +msgid "File `%s' is not a valid ruby file" +msgstr "Bestand `%s' is geen geldig ruby bestand" + +#: ../gnoemoe/gm-scripts.c:522 #, c-format msgid "File `%s' already loaded" msgstr "Bestand `%s' is al toegevoegd" -#: ../gnoemoe/gm-scripts.c:518 +#: ../gnoemoe/gm-scripts.c:532 #, c-format msgid "File `%s' added" msgstr "Bestand `%s' toegevoegd" -#: ../gnoemoe/gm-scripts.c:821 +#: ../gnoemoe/gm-scripts.c:855 #, c-format msgid "Register function '%s' from '%s'" msgstr "Registreer functie '%s' uit '%s" -#: ../gnoemoe/gm-scripts.c:829 +#: ../gnoemoe/gm-scripts.c:863 #, c-format msgid "Script '%s' is already defined" msgstr "Script '%s' is al gedefinieerd" @@ -296,7 +301,7 @@ msgid "Search for and replace text" msgstr "Zoeken naar en vervangen van tekst" #. Toolbar -#: ../gnoemoe/gm-ui.h:97 ../ui/gm-world-properties.glade.h:15 +#: ../gnoemoe/gm-ui.h:97 ../ui/gm-world-properties.glade.h:28 #: ../ui/gm-triggers.glade.h:5 msgid "Triggers" msgstr "Triggers" @@ -309,14 +314,13 @@ msgstr "Bewerk de huidige wereld triggers" msgid "Properties" msgstr "Eigenschappen" -#: ../gnoemoe/gm-world.c:1240 -msgid "# Could not save editor text, world is not connected at the moment" -msgstr "" -"# Kon editor tekst niet opslaan, wereld is op het moment niet verbonden" +#: ../gnoemoe/gm-world.c:1265 +msgid "Could not save editor text, world is not connected at the moment" +msgstr "Kon editor tekst niet opslaan, wereld is op het moment niet verbonden" -#: ../gnoemoe/gm-world.c:1277 -msgid "# Reconnecting in 3 seconds..." -msgstr "# Opnieuw verbinden in 3 seconden..." +#: ../gnoemoe/gm-world.c:1302 +msgid "Reconnecting in 3 seconds..." +msgstr "Opnieuw verbinden in 3 seconden..." #: ../gnoemoe/dialogs/gm-scripts-dialog.c:30 msgid "" @@ -372,22 +376,16 @@ msgid "New " msgstr "Nieuw " #: ../gnoemoe/dialogs/gm-scripts-dialog.c:339 -msgid "User: " -msgstr "Gebruiker:" +#: ../gnoemoe/dialogs/gm-scripts-dialog.c:461 +msgid "User" +msgstr "Gebruiker" #: ../gnoemoe/dialogs/gm-scripts-dialog.c:341 -msgid "Share: " -msgstr "Gedeeld:" - #: ../gnoemoe/dialogs/gm-scripts-dialog.c:458 #: ../gnoemoe/dialogs/gm-scripts-dialog.c:743 msgid "Share" msgstr "Gedeeld" -#: ../gnoemoe/dialogs/gm-scripts-dialog.c:461 -msgid "User" -msgstr "Gebruiker" - #: ../gnoemoe/dialogs/gm-scripts-dialog.c:486 msgid "Filename" msgstr "Bestandsnaam" @@ -404,35 +402,35 @@ msgstr "Veranderd " msgid "Save file" msgstr "Bestand opslaan" -#: ../gnoemoe/dialogs/gm-triggers-dialog.c:104 ../ui/gm-preferences.glade.h:12 +#: ../gnoemoe/dialogs/gm-triggers-dialog.c:104 ../ui/gm-preferences.glade.h:18 msgid "Black" msgstr "Zwart" -#: ../gnoemoe/dialogs/gm-triggers-dialog.c:105 ../ui/gm-preferences.glade.h:40 +#: ../gnoemoe/dialogs/gm-triggers-dialog.c:105 ../ui/gm-preferences.glade.h:48 msgid "Red" msgstr "Rood" -#: ../gnoemoe/dialogs/gm-triggers-dialog.c:106 ../ui/gm-preferences.glade.h:28 +#: ../gnoemoe/dialogs/gm-triggers-dialog.c:106 ../ui/gm-preferences.glade.h:34 msgid "Green" msgstr "Groen" -#: ../gnoemoe/dialogs/gm-triggers-dialog.c:107 ../ui/gm-preferences.glade.h:48 +#: ../gnoemoe/dialogs/gm-triggers-dialog.c:107 ../ui/gm-preferences.glade.h:62 msgid "Yellow" msgstr "Geel" -#: ../gnoemoe/dialogs/gm-triggers-dialog.c:108 ../ui/gm-preferences.glade.h:14 +#: ../gnoemoe/dialogs/gm-triggers-dialog.c:108 ../ui/gm-preferences.glade.h:20 msgid "Blue" msgstr "Blauw" -#: ../gnoemoe/dialogs/gm-triggers-dialog.c:109 ../ui/gm-preferences.glade.h:38 +#: ../gnoemoe/dialogs/gm-triggers-dialog.c:109 ../ui/gm-preferences.glade.h:45 msgid "Purple" msgstr "Paars" -#: ../gnoemoe/dialogs/gm-triggers-dialog.c:110 ../ui/gm-preferences.glade.h:18 +#: ../gnoemoe/dialogs/gm-triggers-dialog.c:110 ../ui/gm-preferences.glade.h:24 msgid "Cyan" msgstr "Cyaan" -#: ../gnoemoe/dialogs/gm-triggers-dialog.c:111 ../ui/gm-preferences.glade.h:46 +#: ../gnoemoe/dialogs/gm-triggers-dialog.c:111 ../ui/gm-preferences.glade.h:60 msgid "White" msgstr "Wit" @@ -477,6 +475,8 @@ msgid "Offline" msgstr "Niet verbonden" #: ../gnoemoe/dialogs/gm-triggers-dialog.c:130 +#: ../gnoemoe/mcp/gm-mcp-icecrew-userlist.c:924 +#: ../gnoemoe/mcp/gm-mcp-vmoo-userlist.c:491 msgid "Idle" msgstr "Luieren" @@ -485,7 +485,8 @@ msgid "No longer idle" msgstr "Niet langer inactief" #: ../gnoemoe/dialogs/gm-triggers-dialog.c:132 -#: ../gnoemoe/mcp/gm-mcp-icecrew-userlist.c:950 +#: ../gnoemoe/mcp/gm-mcp-icecrew-userlist.c:920 +#: ../gnoemoe/mcp/gm-mcp-vmoo-userlist.c:488 msgid "Away" msgstr "Afwezig" @@ -725,7 +726,7 @@ msgstr "Vietnamees" msgid "Thai" msgstr "Thais" -#: ../gnoemoe/dialogs/gm-world-properties-dialog.c:175 +#: ../gnoemoe/dialogs/gm-world-properties-dialog.c:178 #, c-format msgid "" "%s\n" @@ -736,24 +737,24 @@ msgstr "" "Condities: %d\n" "Acties: %d" -#: ../gnoemoe/dialogs/gm-world-properties-dialog.c:357 +#: ../gnoemoe/dialogs/gm-world-properties-dialog.c:401 msgid "World properties - " msgstr "Wereld eigenschappen - " -#: ../gnoemoe/dialogs/gm-world-properties-dialog.c:505 +#: ../gnoemoe/dialogs/gm-world-properties-dialog.c:571 #, c-format msgid "Name can not be %s because a world with that name already exists." msgstr "Naam kan niet %s zijn omdat er al een wereld bestaat met die naam." -#: ../gnoemoe/dialogs/gm-world-properties-dialog.c:524 +#: ../gnoemoe/dialogs/gm-world-properties-dialog.c:590 msgid "Host can not be empty, please fill in a host." msgstr "Host kan niet leeg zijn, vul alsjeblieft een host in." -#: ../gnoemoe/dialogs/gm-world-properties-dialog.c:670 +#: ../gnoemoe/dialogs/gm-world-properties-dialog.c:737 msgid "Select a trigger to edit first" msgstr "Selecteer eerst een trigger om te bewerken" -#: ../gnoemoe/dialogs/gm-world-properties-dialog.c:687 +#: ../gnoemoe/dialogs/gm-world-properties-dialog.c:754 msgid "First select a trigger to remove" msgstr "Selecteer eerst een trigger om te verwijderen" @@ -780,15 +781,15 @@ msgstr "Je moet eerst de wereld waarmee je wilt verbinden selecteren." msgid "You first need to select a world to duplicate." msgstr "Je moet eerst de wereld die je wilt dupliceren selecteren!" -#: ../gnoemoe/dialogs/gm-preferences-dialog.c:104 +#: ../gnoemoe/dialogs/gm-preferences-dialog.c:114 msgid "Default" msgstr "Standaard" -#: ../gnoemoe/dialogs/gm-preferences-dialog.c:105 +#: ../gnoemoe/dialogs/gm-preferences-dialog.c:115 msgid "White on black" msgstr "Wit op zwart" -#: ../gnoemoe/dialogs/gm-preferences-dialog.c:106 +#: ../gnoemoe/dialogs/gm-preferences-dialog.c:116 msgid "User defined" msgstr "Gebruiker gedefinieerd" @@ -796,97 +797,92 @@ msgstr "Gebruiker gedefinieerd" msgid "Welcome to GnoeMoe, explorer of new worlds!" msgstr "Welkom bij GnoeMoe, verkenner van nieuwe werelden!" -#: ../gnoemoe/widgets/gm-world-view.c:459 ../ui/gm-world-properties.glade.h:16 +#: ../gnoemoe/widgets/gm-world-view.c:459 ../ui/gm-world-properties.glade.h:29 msgid "World" msgstr "Wereld" #: ../gnoemoe/widgets/gm-world-view.c:843 #, c-format -msgid "# Connect failed: %s" -msgstr "# Connectie faalde: %s" - -#: ../gnoemoe/widgets/gm-world-view.c:846 -#, c-format -msgid "# Connection lost... (%s)" -msgstr "# Connectie verloren... (%s)" +msgid "Connect failed: %s" +msgstr "Connectie faalde: %s" #: ../gnoemoe/widgets/gm-world-view.c:849 #, c-format -msgid "# Error: %s" -msgstr "# Fout: %s" +msgid "Error: %s" +msgstr "Fout: %s" #: ../gnoemoe/widgets/gm-world-view.c:865 #, c-format -msgid "# Trying %s port %s" -msgstr "# Probeer %s poort %s" +msgid "Trying %s port %s" +msgstr "Probeer %s poort %s" #: ../gnoemoe/widgets/gm-world-view.c:869 #, c-format -msgid "# Connecting to %s port %s" -msgstr "# Verbinding maken naar %s poort %s" +msgid "Connecting to %s port %s" +msgstr "Verbinding maken naar %s poort %s" #: ../gnoemoe/widgets/gm-world-view.c:873 -msgid "# Connected" -msgstr "# Verbonden" +msgid "Connected" +msgstr "Verbonden" #: ../gnoemoe/widgets/gm-world-view.c:878 -msgid "# Disconnected" -msgstr "# Verbinding verbroken" +msgid "Disconnected" +msgstr "Verbinding verbroken" #: ../gnoemoe/widgets/gm-world-view.c:883 -msgid "# Disconnecting" -msgstr "# Verbinding verbreken" +msgid "Disconnecting" +msgstr "Verbinding verbreken" -#: ../gnoemoe/widgets/gm-editor-view.c:293 +#: ../gnoemoe/widgets/gm-editor-view.c:305 msgid "Errors" msgstr "Fouten" -#: ../gnoemoe/widgets/gm-editor-view.c:311 +#: ../gnoemoe/widgets/gm-editor-view.c:323 msgid "Warnings" msgstr "Waarschuwingen" -#: ../gnoemoe/widgets/gm-editor-view.c:405 +#: ../gnoemoe/widgets/gm-editor-view.c:417 #, c-format msgid "Line %d: %s\n" msgstr "Regel %d: %s\n" -#: ../gnoemoe/widgets/gm-editor-view.c:410 +#: ../gnoemoe/widgets/gm-editor-view.c:422 #, c-format msgid "Line %d:%d: %s\n" msgstr "Regel %d:%d: %s\n" -#: ../gnoemoe/widgets/gm-editor-view.c:476 +#: ../gnoemoe/widgets/gm-editor-view.c:488 msgid "There is 1 error" msgstr "Er is 1 fout" -#: ../gnoemoe/widgets/gm-editor-view.c:478 +#: ../gnoemoe/widgets/gm-editor-view.c:490 #, c-format msgid "There are %d errors" msgstr "Er zijn %d fouten" -#: ../gnoemoe/widgets/gm-editor-view.c:503 +#: ../gnoemoe/widgets/gm-editor-view.c:515 msgid "There is 1 warning" msgstr "Er is 1 waarschuwing" -#: ../gnoemoe/widgets/gm-editor-view.c:505 +#: ../gnoemoe/widgets/gm-editor-view.c:517 msgid " and 1 warning" msgstr " en 1 waarschuwing" -#: ../gnoemoe/widgets/gm-editor-view.c:509 +#: ../gnoemoe/widgets/gm-editor-view.c:521 #, c-format msgid "There are %d warnings" msgstr "Er zijn %d waarschuwingen" -#: ../gnoemoe/widgets/gm-editor-view.c:512 +#: ../gnoemoe/widgets/gm-editor-view.c:524 #, c-format msgid " and %d warnings" msgstr " en %d waarschuwingen" -#: ../gnoemoe/widgets/gm-editor-view.c:544 +#: ../gnoemoe/widgets/gm-editor-view.c:556 msgid "There are no errors" msgstr "Er zijn geen fouten" -#: ../gnoemoe/widgets/gm-editor-view.c:572 +#: ../gnoemoe/widgets/gm-editor-view.c:584 msgid "No errors are found" msgstr "Er zijn geen fouten gevonden" @@ -971,31 +967,37 @@ msgstr "(C) 2004-2005 Icecrew.nl" msgid "You didn't select a log file" msgstr "Je hebt geen log bestand geselecteerd" -#: ../gnoemoe/widgets/gm-log-view.c:127 +#: ../gnoemoe/widgets/gm-log-view.c:109 msgid "Filter: " msgstr "Filter: " -#: ../gnoemoe/widgets/gm-log-view.c:133 ../ui/gm-preferences.glade.h:30 +#: ../gnoemoe/widgets/gm-log-view.c:115 ../ui/gm-preferences.glade.h:36 +#: ../ui/gm-world-properties.glade.h:14 msgid "Incoming" msgstr "Binnenkomend" -#: ../gnoemoe/widgets/gm-log-view.c:141 ../ui/gm-preferences.glade.h:36 +#: ../gnoemoe/widgets/gm-log-view.c:123 ../ui/gm-preferences.glade.h:43 +#: ../ui/gm-world-properties.glade.h:22 msgid "Outgoing" msgstr "Uitgaand" -#: ../gnoemoe/widgets/gm-log-view.c:149 ../ui/gm-preferences.glade.h:43 +#: ../gnoemoe/widgets/gm-log-view.c:131 ../ui/gm-preferences.glade.h:55 +#: ../ui/gm-world-properties.glade.h:27 msgid "Status" msgstr "Status" -#: ../gnoemoe/widgets/gm-log-view.c:158 ../ui/gm-preferences.glade.h:32 +#: ../gnoemoe/widgets/gm-log-view.c:140 ../ui/gm-preferences.glade.h:38 +#: ../ui/gm-world-properties.glade.h:18 msgid "Mcp incoming" msgstr "Mcp binnenkomend" -#: ../gnoemoe/widgets/gm-log-view.c:167 ../ui/gm-preferences.glade.h:33 +#: ../gnoemoe/widgets/gm-log-view.c:149 ../ui/gm-preferences.glade.h:39 +#: ../ui/gm-world-properties.glade.h:19 msgid "Mcp outgoing" msgstr "Mcp uitgaand" -#: ../gnoemoe/widgets/gm-log-view.c:176 ../ui/gm-preferences.glade.h:34 +#: ../gnoemoe/widgets/gm-log-view.c:158 ../ui/gm-preferences.glade.h:40 +#: ../ui/gm-world-properties.glade.h:20 msgid "Mcp status" msgstr "Mcp status" @@ -1028,18 +1030,26 @@ msgid "Logo" msgstr "Logo" #: ../gnoemoe/widgets/gm-worlds-view.c:141 -#: ../gnoemoe/mcp/gm-mcp-userlist-view.c:98 +#: ../gnoemoe/mcp/gm-mcp-userlist-view.c:231 ../ui/gm-preferences.glade.h:41 msgid "Name" msgstr "Naam" -#: ../gnoemoe/mcp/gm-mcp-userlist-view.c:92 +#: ../gnoemoe/mcp/gm-mcp-userlist-view.c:225 msgid "I" msgstr "I" -#: ../gnoemoe/mcp/gm-mcp-icecrew-userlist.c:952 +#: ../gnoemoe/mcp/gm-mcp-userlist-view.c:358 +msgid "Available" +msgstr "Beschikbaar" + +#: ../gnoemoe/mcp/gm-mcp-icecrew-userlist.c:922 msgid "Busy" msgstr "Bezig" +#: ../gnoemoe/mcp/gm-mcp-vmoo-userlist.c:494 +msgid "Idle and away" +msgstr "Luieren en weg" + #: ../gnoemoe/parser/parser.y:306 msgid "Unreachable EXCEPT clause" msgstr "Onbereikbare EXCEPT clause" @@ -1221,7 +1231,7 @@ msgstr "Geen omsluitende loop voor `continue' statement" msgid "Console" msgstr "Console" -#: ../ui/gm-scripts.glade.h:2 ../ui/gm-preferences.glade.h:20 +#: ../ui/gm-scripts.glade.h:2 ../ui/gm-preferences.glade.h:27 msgid "Editor" msgstr "Editor" @@ -1242,126 +1252,178 @@ msgid "Default" msgstr "Standaard" #: ../ui/gm-preferences.glade.h:4 -msgid "Enable" -msgstr "Mogelijk maken" - -#: ../ui/gm-preferences.glade.h:5 msgid "Font" msgstr "Lettertype" -#: ../ui/gm-preferences.glade.h:6 +#: ../ui/gm-preferences.glade.h:5 msgid "Foreground" msgstr "Voorgrond" -#: ../ui/gm-preferences.glade.h:7 +#: ../ui/gm-preferences.glade.h:6 msgid "Internal editor" msgstr "Interne editor" -#: ../ui/gm-preferences.glade.h:8 +#: ../ui/gm-preferences.glade.h:7 ../ui/gm-world-properties.glade.h:4 +msgid "Log format" +msgstr "Log formaat" + +#: ../ui/gm-preferences.glade.h:8 ../ui/gm-world-properties.glade.h:5 msgid "Log types" msgstr "Log types" -#: ../ui/gm-preferences.glade.h:9 +#: ../ui/gm-preferences.glade.h:9 ../ui/gm-world-properties.glade.h:6 +msgid "Logging" +msgstr "Loggen" + +#: ../ui/gm-preferences.glade.h:10 +msgid "Player state" +msgstr "Speler staat" + +#: ../ui/gm-preferences.glade.h:11 msgid "Schemes" msgstr "Schema's" -#: ../ui/gm-preferences.glade.h:10 +#: ../ui/gm-preferences.glade.h:12 +msgid "Sort" +msgstr "Sorteren" + +#: ../ui/gm-preferences.glade.h:13 +msgid "Text" +msgstr "Tekst" + +#: ../ui/gm-preferences.glade.h:14 ../ui/gm-world-properties.glade.h:8 +msgid "Add log type before each line" +msgstr "Log type invoegen voor elke regel" + +#: ../ui/gm-preferences.glade.h:15 ../ui/gm-world-properties.glade.h:9 +msgid "Add timestamp before each line" +msgstr "Tijd invoegen voor elke regel" + +#: ../ui/gm-preferences.glade.h:16 msgid "Background" msgstr "Achtergrond" -#: ../ui/gm-preferences.glade.h:11 +#: ../ui/gm-preferences.glade.h:17 msgid "Background:" msgstr "Achtergrond:" -#: ../ui/gm-preferences.glade.h:13 +#: ../ui/gm-preferences.glade.h:19 msgid "Black High" msgstr "Zwart Fel" -#: ../ui/gm-preferences.glade.h:15 +#: ../ui/gm-preferences.glade.h:21 msgid "Blue High" msgstr "Blauw Fel" -#: ../ui/gm-preferences.glade.h:16 +#: ../ui/gm-preferences.glade.h:22 msgid "Check syntax automatically" msgstr "Automatisch syntax controleren" -#: ../ui/gm-preferences.glade.h:17 +#: ../ui/gm-preferences.glade.h:23 msgid "Colors" msgstr "Kleuren" -#: ../ui/gm-preferences.glade.h:19 +#: ../ui/gm-preferences.glade.h:25 msgid "Cyan High" msgstr "Cyaan Fel" -#: ../ui/gm-preferences.glade.h:21 +#: ../ui/gm-preferences.glade.h:26 +msgid "Disable all logging" +msgstr "Loggen overal uitschakelen" + +#: ../ui/gm-preferences.glade.h:28 msgid "Embed editor into GnoeMoe (implies terminal)" msgstr "Geëmbedde editor (impliceert terminal)" -#: ../ui/gm-preferences.glade.h:22 -msgid "Enable logging" -msgstr "Loggen mogelijk maken" - -#: ../ui/gm-preferences.glade.h:23 +#: ../ui/gm-preferences.glade.h:29 msgid "Font" msgstr "Lettertype" -#: ../ui/gm-preferences.glade.h:24 +#: ../ui/gm-preferences.glade.h:30 msgid "Font description:" msgstr "Lettertype beschrijving:" -#: ../ui/gm-preferences.glade.h:25 +#: ../ui/gm-preferences.glade.h:31 msgid "Foreground" msgstr "Voorgrond" -#: ../ui/gm-preferences.glade.h:26 +#: ../ui/gm-preferences.glade.h:32 msgid "Foreground High" msgstr "Voorgrond Fel" -#: ../ui/gm-preferences.glade.h:27 +#: ../ui/gm-preferences.glade.h:33 msgid "Foreground:" msgstr "Voorgrond:" -#: ../ui/gm-preferences.glade.h:29 +#: ../ui/gm-preferences.glade.h:35 msgid "Green High" msgstr "Groen Fel" -#: ../ui/gm-preferences.glade.h:31 +#: ../ui/gm-preferences.glade.h:37 ../ui/gm-world-properties.glade.h:17 msgid "Logging" msgstr "Loggen" -#: ../ui/gm-preferences.glade.h:35 +#: ../ui/gm-preferences.glade.h:42 msgid "Needs terminal" msgstr "Terminal nodig" -#: ../ui/gm-preferences.glade.h:37 +#: ../ui/gm-preferences.glade.h:44 msgid "Preferences" msgstr "Voorkeuren" -#: ../ui/gm-preferences.glade.h:39 +#: ../ui/gm-preferences.glade.h:46 msgid "Purple High" msgstr "Paars Fel" -#: ../ui/gm-preferences.glade.h:41 +#: ../ui/gm-preferences.glade.h:47 +msgid "Rank, name" +msgstr "Rang, naam" + +#: ../ui/gm-preferences.glade.h:49 msgid "Red High" msgstr "Rood Fel" -#: ../ui/gm-preferences.glade.h:42 +#: ../ui/gm-preferences.glade.h:50 msgid "Select scheme:" msgstr "Selecteer schema:" -#: ../ui/gm-preferences.glade.h:44 +#: ../ui/gm-preferences.glade.h:51 +msgid "Show object number" +msgstr "Toon object nummer" + +#: ../ui/gm-preferences.glade.h:52 +msgid "Show player status message" +msgstr "Toon speler status bericht" + +#: ../ui/gm-preferences.glade.h:53 +msgid "State, name" +msgstr "Staat, naam" + +#: ../ui/gm-preferences.glade.h:54 +msgid "State, rank, name" +msgstr "Staat, rang, naam" + +#: ../ui/gm-preferences.glade.h:56 msgid "Use alternative editor" msgstr "Gebruik alternatieve editor" -#: ../ui/gm-preferences.glade.h:45 +#: ../ui/gm-preferences.glade.h:57 +msgid "Use state icon" +msgstr "Gebruik staat icoon" + +#: ../ui/gm-preferences.glade.h:58 msgid "Use system font" msgstr "Gebruik systeem lettertype" -#: ../ui/gm-preferences.glade.h:47 +#: ../ui/gm-preferences.glade.h:59 +msgid "Userlist" +msgstr "Gebruikerslijst" + +#: ../ui/gm-preferences.glade.h:61 msgid "White High" msgstr "Wit Fel" -#: ../ui/gm-preferences.glade.h:49 +#: ../ui/gm-preferences.glade.h:63 msgid "Yellow High" msgstr "Geel Fel" @@ -1389,51 +1451,55 @@ msgstr "Algemeen" msgid "Language" msgstr "Taal" -#: ../ui/gm-world-properties.glade.h:4 +#: ../ui/gm-world-properties.glade.h:7 msgid "Server" msgstr "Server" -#: ../ui/gm-world-properties.glade.h:5 +#: ../ui/gm-world-properties.glade.h:10 msgid "Automatic login" msgstr "Automatisch inloggen" -#: ../ui/gm-world-properties.glade.h:6 +#: ../ui/gm-world-properties.glade.h:11 msgid "Automatic reconnect" msgstr "Automatisch opnieuw verbinden" -#: ../ui/gm-world-properties.glade.h:7 +#: ../ui/gm-world-properties.glade.h:12 msgid "Character encoding:" msgstr "Tekencodering:" -#: ../ui/gm-world-properties.glade.h:8 +#: ../ui/gm-world-properties.glade.h:13 msgid "Host:" msgstr "Host:" -#: ../ui/gm-world-properties.glade.h:9 +#: ../ui/gm-world-properties.glade.h:15 msgid "Language" msgstr "Taal" -#: ../ui/gm-world-properties.glade.h:10 +#: ../ui/gm-world-properties.glade.h:16 msgid "Load on startup" msgstr "Laden bij opstarten" -#: ../ui/gm-world-properties.glade.h:11 ../ui/gm-triggers.glade.h:4 +#: ../ui/gm-world-properties.glade.h:21 ../ui/gm-triggers.glade.h:4 msgid "Name:" msgstr "Naam:" -#: ../ui/gm-world-properties.glade.h:12 +#: ../ui/gm-world-properties.glade.h:23 +msgid "Override application logging settings" +msgstr "Overheers applicatie loggen instellingen" + +#: ../ui/gm-world-properties.glade.h:24 msgid "Password:" msgstr "Wachtwoord:" -#: ../ui/gm-world-properties.glade.h:13 +#: ../ui/gm-world-properties.glade.h:25 msgid "Player name:" msgstr "Speler naam:" -#: ../ui/gm-world-properties.glade.h:14 +#: ../ui/gm-world-properties.glade.h:26 msgid "Port:" msgstr "Poort:" -#: ../ui/gm-world-properties.glade.h:17 +#: ../ui/gm-world-properties.glade.h:30 msgid "World properties" msgstr "Wereld eigenschappen" @@ -1489,6 +1555,18 @@ msgstr "Wereld" msgid "Select log file to open" msgstr "Selecteer log bestand om te openen" +#~ msgid "User: " +#~ msgstr "Gebruiker:" + +#~ msgid "Share: " +#~ msgstr "Gedeeld:" + +#~ msgid "# Connection lost... (%s)" +#~ msgstr "# Connectie verloren... (%s)" + +#~ msgid "Enable" +#~ msgstr "Mogelijk maken" + #~ msgid "_Find..." #~ msgstr "_Zoeken..." diff --git a/scripts/run.rb b/scripts/run.rb index 8a13846..0902f70 100644 --- a/scripts/run.rb +++ b/scripts/run.rb @@ -1,65 +1,107 @@ -=begin - run.rb - Copyright (c) 2004 by Jesse van den Kieboom - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Defines: - run - open a world - crun - send all connected worlds the same text -=end +# +# run.rb - several scripts to redirect shell command output to the world +# +# Copyright (c) 2006 by Paul van Tilburg +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Defines: +# sh - run a command, send output to the user only +# run - run a command, send the output to the world +# crun - run a commend, send the output to a channel in the world +# pstrun - run a command, send the output to the world via @paste +# ppstrun - run a command, send the output to a player in the world via @paste +# prefrun - run a command, send the output to the world with each +# line prefixed def register_functions + $scripts.register("sh", "use: /sh \nruns in a subshell and sends output to the screen") $scripts.register("run", "use: /run \nruns in a subshell and sends output to the world") - $scripts.register("crun", "use: /crun \nsame as /run except it sends output to a channel") + $scripts.register("crun", "use: /crun \nruns in a subshell and sends output to the channel identified by the ") + $scripts.register("pstrun", "use: /pstrun \nruns in a subshell and sends output via @paste to the world") + $scripts.register("ppstrun", "use: /ppstrun \nruns in a subshell and sends output via @paste to ") + $scripts.register("prefrun", "use: /prefun \nruns in a subshell and sends output to the world with each line preceeded by ") end -def run(argstr) - io = IO.popen(argstr) - - if (io) - $world.sendln(":LINUXes `" + argstr + "`") - - while ((l = io.gets)) - $world.sendln("emote | " + l[0..-2]) - end - - io.close +def sh(cmd) + if cmd + $world.status("Executing `#{cmd}`") + do_cmd(cmd) { |line| $world.status(line) } else - $world.writeln("Script error: can not execute #{argstr}!") + error("use /sh ") + end +end # def sh + +def run2(cmd) + if cmd + $world.sendln("emote LINUXes `#{cmd}`") + do_cmd(cmd) { |line| $world.sendln("emote | #{line}") } + else + error("use /run2 ") + end +end # def run2 + +def crun2(argstr) + chan, cmd = argstr.split(/\s+/, 2) + if chan and cmd + $world.sendln("#{cmd} emote LINUXes `#{argstr}`") + do_cmd(cmd) { |line| $world.sendln("#{chan} emote | #{line}") } + else + error("use /crun2 ") + end +end # def crun2 + +def pstrun(cmd) + if cmd + $world.sendln("@paste") + $world.sendln("$ #{cmd}") + do_cmd(cmd) { |line| $world.sendln(line) } + $world.sendln(".") + else + error("use /pstrun ") + end +end # def pstrun + +def ppstrun(argstr) + player, cmd = argstr.split(/\s+/, 2) + if player and cmd + $world.sendln("@paste #{player}") + $world.sendln("$ #{cmd}") + do_cmd(cmd) { |line| $world.sendln(line) } + $world.sendln(".") + else + error("use /ppstrun ") + end +end # def ppstrun + +def prefrun(argstr) + prefix, cmd = argstr.split(/\s+/, 2) + if prefix and cmd + do_cmd(cmd) { |line| $world.sendln("#{prefix} #{line}") } + else + error("use /prefrun ") + end +end # def prefrun + +# Helper functions. +def do_cmd(command, &action) + IO.popen("#{command} 2>&1") do |io| + io.each_line { |line| yield line.chomp } end end -def crun(argstr) - ar = argstr.split(" ", 2) - - if (ar.length != 2) - $world.writeln("Script error: use /crun ") - else - io = IO.popen(ar[1]) - - if (io) - $world.sendln(ar[0] + " :LINUXes `" + ar[1] + "`") - - while ((l = io.gets)) - $world.sendln(ar[0] + " :| " + l[0..-2]) - end - - io.close - else - $world.writeln("Script error: can not execute #{ar[1]}!") - end - end +def error(msg) + $world.status("Script error: #{msg}") end diff --git a/ui/gm-preferences.glade b/ui/gm-preferences.glade index f65c147..3a60870 100644 --- a/ui/gm-preferences.glade +++ b/ui/gm-preferences.glade @@ -1395,17 +1395,17 @@ 0 - + True True - Enable logging + Disable all logging True GTK_RELIEF_NORMAL True False False True - + @@ -1414,7 +1414,7 @@ True - <b>Enable</b> + <b>Logging</b> False True GTK_JUSTIFY_LEFT @@ -1620,6 +1620,106 @@ True + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + True + Add timestamp before each line + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + True + True + Add log type before each line + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + + + + + True + <b>Log format</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + False @@ -1649,6 +1749,367 @@ tab + + + + 6 + 16 + 32 + True + False + 0 + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + True + Show object number + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + + + + + True + <b>Text</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + False + + + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + True + Show player status message + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + True + True + Use state icon + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + + + + + True + <b>Player state</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + False + + + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + True + State, rank, name + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + True + True + Rank, name + True + GTK_RELIEF_NORMAL + True + False + False + True + radio_button_state_rank_name + + + + 0 + False + False + + + + + + True + True + State, name + True + GTK_RELIEF_NORMAL + True + False + False + True + radio_button_state_rank_name + + + + 0 + False + False + + + + + + True + True + Name + True + GTK_RELIEF_NORMAL + True + False + False + True + radio_button_state_rank_name + + + + 0 + False + False + + + + + + + + + + True + <b>Sort</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + False + True + + + + + + True + Userlist + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + 0 diff --git a/ui/gm-world-properties.glade b/ui/gm-world-properties.glade index ea42fe2..f9c0295 100644 --- a/ui/gm-world-properties.glade +++ b/ui/gm-world-properties.glade @@ -5,7 +5,7 @@ 400 - 350 + 400 True World properties GTK_WINDOW_TOPLEVEL @@ -850,6 +850,383 @@ tab + + + + 6 + 16 + 32 + True + False + 0 + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + True + Override application logging settings + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + + + + + True + <b>Logging</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + False + + + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + True + Incoming + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Outgoing + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Status + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Mcp incoming + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Mcp outgoing + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Mcp status + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + + + + True + <b>Log types</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + True + Add timestamp before each line + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Add log type before each line + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + + + + True + <b>Log format</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + False + True + + + + + + True + Logging + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + 0