Merge pull request #37 from DeForce/develop

Release to Master
DeForce · Oct 2, 2016 · 44c9c14 · 44c9c14
2 parents efdb7b4 + 653a075
commit 44c9c14
Show file tree

Hide file tree

Showing 28 changed files with 1,144 additions and 871 deletions.
diff --git a/changelog b/changelog
diff --git a/conf/blacklist.cfg b/conf/blacklist.cfg
@@ -1,24 +1,23 @@
+[gui_information]
+category = messaging
+
 [main]
 message = Пытаеться что-то сказать, но у него лалка во рту
 
-[users_gui]
+[users__gui]
 for = users_hide, users_block
 view = list
 addable = true
 
 [users_hide]
-sadas
-12
-1231
-123
-1234
-13213
+akdsjhd
+hg9y745y
 
 [users_block]
 announce
 ghfkdjhg
 
-[words_gui]
+[words__gui]
 for = words_hide, words_block
 addable = true
 view = list
@@ -28,4 +27,3 @@ asd
 
 [words_block]
 
-
diff --git a/conf/c2b.cfg b/conf/c2b.cfg
@@ -1,4 +1,14 @@
+[gui_information]
+category = messaging
+
+[config__gui]
+for = config
+view = list_dual
+addable = true
+
 [config]
-sc2tv=funstream, адольф
-gnomoria=игра, которую нельзя называть
-гномория=игра\, которую нельзя называть
+sc2tv = funstream, адольф
+gnomoria = игра, которую нельзя называть
+гномория = игра, которая не нужна
+czt = lalka
+
diff --git a/conf/config.cfg b/conf/config.cfg
@@ -1,8 +1,11 @@
+[gui_information]
+category = main
+
 [gui]
-show_hidden = true
-gui = true
-on_top = true
-very_big_parameter_with_really_big_name_and_a_lot_of_not_needed_stuff = false
-language = English
+show_hidden = True
+gui = True
+on_top = True
+very_big_parameter_with_really_big_name_and_a_lot_of_not_needed_stuff = False
+language = english
 reload
 
diff --git a/conf/df.cfg b/conf/df.cfg
@@ -1,8 +1,16 @@
+[gui_information]
+category = messaging
+
 [grep]
 symbol=#
 # file=/cygdrive/e/Dwarf Fortress/Dwarf Fortress 0.42.06/names.txt
 file=E:/df.txt
 
+[prof__gui]
+for = prof
+view = list_dual
+addable = true
+
 [prof]
 Archer=([Лл]учник|[Aa]rcher)
 Carpenter=([Пп]лотник|[Cc]arpenter|[Ll]umberjack)

diff --git a/conf/goodgame.cfg b/conf/goodgame.cfg
@@ -1,4 +1,11 @@
+[gui_information]
+category = chat
+
+[config__gui]
+for = config
+hidden = socket
+
 [config]
-socket/hidden = ws://chat.goodgame.ru:8081/chat/websocket
-channel_name = czt
+socket = ws://chat.goodgame.ru:8081/chat/websocket
+channel_name = CzT
 
diff --git a/conf/levels.cfg b/conf/levels.cfg
@@ -1,3 +1,6 @@
+[gui_information]
+category = messaging
+
 [config]
 # experience = static
 # experience = geometrical

diff --git a/conf/logger.cfg b/conf/logger.cfg
@@ -1,3 +1,6 @@
+[gui_information]
+category = messaging
+
 [config]
 logging=true
 rotation=daily

diff --git a/conf/mentions.cfg b/conf/mentions.cfg
@@ -1,6 +1,9 @@
+[gui_information]
+category = messaging
+
 [config]
 
-[config_gui]
+[config__gui]
 for = mentions, address
 view = list
 addable = true

diff --git a/conf/messaging.cfg b/conf/messaging.cfg
@@ -5,4 +5,4 @@ c2b
 df
 levels
 webchat
-#logger
+logger
diff --git a/conf/sc2tv.cfg b/conf/sc2tv.cfg
@@ -1,4 +1,11 @@
+[gui_information]
+category = chat
+
+[config__gui]
+for = config
+hidden = socket
+
 [config]
-socket/hidden = ws://funstream.tv/socket.io/
+socket = ws://funstream.tv/socket.io/
 nick = CzT
 
diff --git a/conf/translations.cfg b/conf/translations.cfg
@@ -7,42 +7,46 @@ menu.reload = Reload WebChat
 *.list_add = Add
 *.list_remove = Remove
 
+settings.main = Main Settings
+settings.messaging = Messaging Modules
+settings.chat = Chat Modules
+
 config = Main
 config.gui = GUI Settings
 config.gui.show_hidden = Show hidden items
-config.gui.show_hidden = Show hidden items
-config.gui.enabled = Is GUI enabled
+config.gui.gui = Is GUI enabled
 config.gui.on_top = Show window on top
 config.gui.very_big_parameter_with_really_big_name_and_a_lot_of_not_needed_stuff = Just a big parameter for test
 config.gui.reload = Reload WebChat
 config.gui.reload.button = Reload
 config.gui.language = Interface language
 
 goodgame = GoodGame
-goodgame.main = Main GoodGame settings
-goodgame.main.socket = GoodGame WS parameters
-goodgame.main.channelname = GoodGame channel name
+goodgame.main = Main Settings
+goodgame.main.socket = WebSocket parameters
+goodgame.main.channelname = Channel name
 
 sc2tv = sc2tv
-sc2tv.main = Main sc2tv settings
-sc2tv.main.socket = sc2tv WS parameters
-sc2tv.main.nick = sc2tv channel name
+sc2tv.main = Main settings
+sc2tv.main.socket = WebSocket parameters
+sc2tv.main.nick = Channel name
 
 twitch = Twitch.TV
-twitch.main.host = Twitch IRC hostname
-twitch.main.port = Twitch IRC port
-twitch.main.channel = Twitch channel name
+twitch.main.host = IRC hostname
+twitch.main.port = IRC port
+twitch.main.channel = Channel name
 twitch.main.bttv = Show BTTV smiles
 
 blacklist = Blacklist
-blacklist.main.message = Blacklist message replace
-blacklist.users = Replace user Blacklist
-blacklist.users_hide = Hide users Blacklist
-blacklist.words = Replace words Blacklist
-blacklist.words_hide = Hide words Blacklist
+blacklist.main = Main Configuration
+blacklist.main.message = Message replace
+blacklist.users_hide = Hide users
+blacklist.users_block = Block users
+blacklist.words_hide = Hide words
+blacklist.words_block = Block words
 
 mentions = Mentions
-mentions.config =
+mentions.config = Configuration
 mentions.config.mentions = Words for Mentions list
 mentions.config.address = Words for Address list
 
@@ -58,10 +62,63 @@ webchat = WebChat
 [russian]
 menu.settings = Настройки
 menu.reload = Перезагрузить Веб Чат
+*.apply_button = Принять
+*.cancel_button = Отменить
+*.list_add = Добавить
+*.list_remove = Удалить
+
+settings.main = Основные настройки
+settings.messaging = Модули сообщений
+settings.chat = Модули чата
+
+config = Главные Настройки
 config.gui = Настройки Интерфейса
-config.gui.enabled = Включить Интерфейс
-config.gui.on_top = Окно выше всех окон
+config.gui.show_hidden = Показать скрытые элементы
+config.gui.gui = Включить Интерфейс
+config.gui.on_top = Окно поверх всех окон
 config.gui.very_big_parameter_with_really_big_name_and_a_lot_of_not_needed_stuff = Большой параметр для теста
 config.gui.reload = Перезагрузить Веб Чат
-config.gui.reload.button = Перезагрузка
+config.gui.reload.button = Перезагрузить
+config.gui.language = Язык интерфейса
+
+goodgame = GoodGame
+goodgame.main = Основные параметры GoodGame
+goodgame.main.socket = Настройки WebSocket
+goodgame.main.channelname = Название канала
+
+sc2tv = sc2tv
+sc2tv.main = Основные параметры
+sc2tv.main.socket = WS параметры
+sc2tv.main.nick = Название канала
+
+twitch = Twitch.TV
+twitch.main.host = IRC хостнейм
+twitch.main.port = IRC порт
+twitch.main.channel = Имя канала
+twitch.main.bttv = Показать BTTV смайлы
+
+blacklist = Чёрный список
+blacklist.main = Основные параметры
+blacklist.main.message = Сообщение замены
+blacklist.users_hide = Список скрытых пользователей
+blacklist.users_block = Список заблокированных пользователей
+blacklist.words_hide = Список слов по которым сообщение будет игнорированно
+blacklist.words_block = Список слов по которым сообщение будет заблокированно
+
+mentions = Упоминания
+mentions.config = Настройки упоминаний
+mentions.config.mentions = Сообщения для упоминания
+mentions.config.address = Сообщения для адресата
+
+c2b = Cloud2Butt
+c2b.config = Настройки
+
+df = Dwarf Fortress
+
+levels = Уровни
+
+webchat = Веб Чат
+
+
+[system]
 
diff --git a/conf/twitch.cfg b/conf/twitch.cfg
@@ -1,6 +1,13 @@
+[gui_information]
+category = chat
+
+[config__gui]
+for = config
+hidden = host, port
+
 [config]
 host = irc.twitch.tv
 port = 6667
-channel = czt1
+channel = CzT1
 bttv = true
 
diff --git a/conf/webchat.cfg b/conf/webchat.cfg
@@ -1,3 +1,7 @@
+[gui_information]
+category = main
+
 [server]
 host = 127.0.0.1
-port = 8080
+port = 14589
+