From 02aef539d126d793f6e0a24de1dcaca907edad96 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sun, 3 Nov 2013 23:07:35 +0000 Subject: MirandaG15: proper version info, russian MirandaG15.txt is moved back grom Deprecated git-svn-id: http://svn.miranda-ng.org/main/trunk@6762 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Plugins/CmdLine.txt | 4 +- langpacks/english/Plugins/MirandaG15.txt | 112 ++++++++++ langpacks/english/Plugins/StartupSilence.txt | 2 + langpacks/english/Plugins/Tipper.txt | 2 +- langpacks/english/Plugins/YAMN.txt | 44 ++-- langpacks/russian/Deprecated/MirandaG15.txt | 231 -------------------- langpacks/russian/Plugins/MirandaG15.txt | 232 +++++++++++++++++++++ .../LCDFramework/LCDFramework_10.vcxproj | 4 - .../LCDFramework/LCDFramework_10.vcxproj.filters | 4 - .../LCDFramework/LCDFramework_11.vcxproj | 4 - .../LCDFramework/LCDFramework_11.vcxproj.filters | 4 - plugins/MirandaG15/MirandaG15_10.vcxproj | 2 + plugins/MirandaG15/MirandaG15_10.vcxproj.filters | 6 + plugins/MirandaG15/MirandaG15_11.vcxproj | 2 + plugins/MirandaG15/MirandaG15_11.vcxproj.filters | 6 + plugins/MirandaG15/res/Version.rc | 38 ++++ plugins/MirandaG15/src/Miranda.cpp | 22 +- plugins/MirandaG15/src/StdAfx.h | 4 +- plugins/MirandaG15/src/Version.h | 14 ++ plugins/MirandaG15/src/m_metacontacts.h | 166 --------------- 20 files changed, 452 insertions(+), 451 deletions(-) create mode 100644 langpacks/english/Plugins/MirandaG15.txt delete mode 100644 langpacks/russian/Deprecated/MirandaG15.txt create mode 100644 langpacks/russian/Plugins/MirandaG15.txt create mode 100644 plugins/MirandaG15/res/Version.rc create mode 100644 plugins/MirandaG15/src/Version.h delete mode 100644 plugins/MirandaG15/src/m_metacontacts.h diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt index 01cb5d8e0c..e8c765ebd7 100644 --- a/langpacks/english/Plugins/CmdLine.txt +++ b/langpacks/english/Plugins/CmdLine.txt @@ -23,7 +23,7 @@ ;file \plugins\CmdLine\src\mimcmd_data.h [Changes account status either globally or per account.\nUsage: status [].\nPossible values for are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n is the name of the account. If it's not specified then the command will issue a global status change.] [Changes away message either globally or per account.\nUsage: awaymsg [].\n is the new away message.\n is an optional parameter specifying the account to set the away message for. If not specified then the away message will be set globally.] -[Changes extended status either globally or per account.\nUsage: xstatus [].\n is the new extended status to set. Possible values are:...\n is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.] +[Changes extended status either globally or per account.\nUsage: xstatus [].\n is the new extended status to set. Possible values are: ...\n is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.] [Disables or enables popups display.\nUsage: popups (disable | enable | toggle).\nThe command will either enable or disable popups display.] [Disables or enables sounds.\nUsage: sounds (disable | enable | toggle).\nThe command will either disable or enable sounds.] [Hides or shows the contact list window.\nUsage: clist (show | hide | toggle).\nThe command will either show or hide the contact list window.] @@ -39,7 +39,7 @@ [Shows history or unread messages for a contact.\nUsage: history .\n is one of the following commands:\n unread - show unread messages for that contact.\n show - show history from event number to . If any number is negative it is interpreted as a relative index from the last event number +1 (so the last event for a contact is -1).] [Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.] [Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname new_nickname.] -[Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) [ [ [..]]].\nThe command will set or remove ignore flags for the specified contacts] +[Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) [ [ [...]]].\nThe command will set or remove ignore flags for the specified contacts] ;file \plugins\CmdLine\src\mimcmd_handlers.cpp [Command '%s' is not currently supported.] [Wrong number of parameters for command '%s'.] diff --git a/langpacks/english/Plugins/MirandaG15.txt b/langpacks/english/Plugins/MirandaG15.txt new file mode 100644 index 0000000000..99593b26d5 --- /dev/null +++ b/langpacks/english/Plugins/MirandaG15.txt @@ -0,0 +1,112 @@ +#muuid {798221e1-e47a-4dc8-9077-1e576f9c4307} +;============================================================ +; File: MirandaG15.dll +; Plugin: MirandaG15 +; Version: 0.1.2.0 +; Authors: Martin Kleinhans +;============================================================ +[Provides an interface to use Miranda from the LCD of various Logitech devices.] +;file \plugins\MirandaG15\res\MirandaG15.rc +[Fonts] +[General settings] +[Show softkey labels] +[Event log:] +[Sample] +[Message log:] +[Contact list:] +[Titles:] +[Notifications:] +[Turn off backlights] +[If the applet is active:] +[Use the VolumeWheel to scroll up and down (might affect system performance)] +[Show seconds in timestamps] +[Use transition effects when changing screens] +[Credits] +[About] +[Mirandag15 + TrillianG15] +[For updates and news check the thread on http://www.g15forums.com] +[Or visit http://www.mkleinhans.de] +[mail@mkleinhans.de] +[© 2006 by Martin Kleinhans] +[Device:] +[If the screensaver is active:] +[Lock the screen] +[Skip driver missing notification] +[Notifications] +[Notification screen title] +[Hide it] +[Show the plugin name] +[Show a short event summary] +[Size of the log] +[Notification duration] +[events] +[seconds] +[Notification types] +[Incoming messages] +[Contact signs off] +[Contact changes status] +[Incoming URL] +[Contact list events] +[Incoming file transfers] +[Protocol disconnected] +[Protocol connected] +[Protocol status changes] +[Show only events from the following protocols:] +[Contact signs on] +[When a chat session is active, skip the following notifications for that contact:] +[Chat session specific] +[Show timestamps] +[Messages] +[User events] +[Emotes] +[Status changes] +[Special IRC events:] +[Notices] +[Channel events] +[Cut off nicknames after] +[chars] +[Show protocol labels] +[Don't skip when replying] +[Exceptions:] +[Cut off channel names after] +[Contact list] +[Show the contacts protocols] +[Hide offline users] +[Use ignore settings] +[Use groups/subgroups] +[Grouped mode] +[Draw tree lines] +[Show counters behind group names] +[Reset selection] +[When opening the contact list screen:] +[Don't change group states] +[Collapse all groups] +[Show only contacts from the following protocols:] +[Protocol filter] +[Expand all groups] +[Use two columns] +[Fade out selection rectangle] +[Chat] +[Typing notifications] +[Show typing notifications] +[Send typing notifications] +[Maximizing] +[When maximized:] +[Hide title] +[Hide labels] +[Show only new messages] +[Mark incoming messages as read] +[Maximized scrolling] +[Size of the log:] +[On incoming messages:] +[Do nothing] +[Scroll to the first line] +[Scroll to the last line] +[Replying] +[Show line break indicators] +[Send messages with return, insert line breaks with ctrl+return] +[Maximized replying] +[Close chat after] +[When in background] +;file \plugins\MirandaG15\src\CConfig.cpp +[No device attached] diff --git a/langpacks/english/Plugins/StartupSilence.txt b/langpacks/english/Plugins/StartupSilence.txt index 7cb1abafe3..c2d9229525 100644 --- a/langpacks/english/Plugins/StartupSilence.txt +++ b/langpacks/english/Plugins/StartupSilence.txt @@ -35,7 +35,9 @@ [Toggle Silence OFF TTB] [Toggle Silence ON TTB] [Sounds and popups are enabled] +[Filtered mode On] [Sounds and popups are disabled temporarily] +[Sounds and popups are disabled temporarily\nAllow mRadio or Weather popups, etc...] [Silent Startup mode changed to ON] [Silent Startup mode changed to OFF] [Silence At Startup is ON] diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt index 25ae436970..cac9d20433 100644 --- a/langpacks/english/Plugins/Tipper.txt +++ b/langpacks/english/Plugins/Tipper.txt @@ -70,7 +70,7 @@ [characters] [Disable in invisible status] [Skins] -[Opacity(%):] +[Opacity (%):] [Transparency] [Effects] [Border] diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt index 8b556ed050..16e46b9920 100644 --- a/langpacks/english/Plugins/YAMN.txt +++ b/langpacks/english/Plugins/YAMN.txt @@ -14,40 +14,40 @@ [Copyright:] [Contact:] [WWW:] -[Check this account] -[Check interval [min]:] -[Notifications] -[Sound] -[Message] -[Tray Icon] -[Keyboard Flash] -[Execute Application] -[Use contact notification for this account] -[Replace nick name] -[Disable Events] +[Account] +[Name:] [Server:] +[Port:] +[SSL] +[APOP] [User Name:] [Password:] [Codepage:] -[Port:] -[SSL] +[Default] [Disable STLS] +[Status:] +[Options] +[Check this account] [Startup check] +[Check interval [min]:] +[Only check when...] [Auto retrieve body] [Check from menu] -[Only check when...] +[Use contact notification for this account] +[Replace nick name] +[Disable Events] +[Notifications] +[New Mail] +[Sound] +[Message] +[Keyboard Flash] +[Tray Icon] +[Execute Application] +[Errors] [Sound notification if failed] [Message notification if failed] [Tray icon notification if failed] [Reset counter] -[Default] -[Status:] -[Account] -[APOP] -[Name:] -[Options] -[New Mail] -[Errors] [Check while...] [Cancel] [Choose modes] diff --git a/langpacks/russian/Deprecated/MirandaG15.txt b/langpacks/russian/Deprecated/MirandaG15.txt deleted file mode 100644 index b60cba96fd..0000000000 --- a/langpacks/russian/Deprecated/MirandaG15.txt +++ /dev/null @@ -1,231 +0,0 @@ -;============================================================ -; File: MirandaG15.dll -; Module: Use Miranda with your Logitech G15 -; Versions: 1.1.14 -; URL: http://addons.miranda-im.org/details.php?action=viewfile&id=2610 -;============================================================ -[Timeout: No response from contact/server] -Таймаут: Нет ответа от контакта/сервера -[New message from %s] -Новое сообщение от %s -[Incoming URL from %s] -Новая ссылка от %s -[Incoming contacts from %s] -Новый контакт от %s -[You were added by %s] -%s добавил вас! -[Authrequest from %s] -Запрос авторизации от %s -[Incoming file from %s] -Входящий файл от %s -[%s has joined the channel] -%s Присоединился к каналу. -[%s has left: %s] -%s вышел: %s -[%s has disconnected: %s] -%s отсоединился: %s -[%s has kicked %s: %s] -%s выбросил %s: %s -[Topic is now '%s' (set by %s)] -Тема: "%s" (установил %s) -[%s enables '%s' for %s] -%s включает "%s" для %s -[%s disables '%s' for %s] -%s отключает "%s" для %s -[Joined %s] -Присоединились к %s -[%s signed on (%s)] -%s приходит (%s) -[Left %s] -Покинули %s -[%s signed off] -%s уходит -[Contactlist event] -Событие списка контактов -[You are now %s] -Вы теперь %s -[Protocol status change] -Изменение статуса протокола -[%s was deleted from contactlist!] -%s был удален из списка контактов! - -; /CChatScreen.cpp -[typing..] -набирает текст.. -[IRC-Chatroom support is disabled!\nYou need to install the patched IRC.dll (see the readme) to use IRC-Chatrooms on the LCD] -Поддержка чатов IRC отключена!\nВам нужно установить IRC.dll (смотрите Readme) для активации этой функции! -[Sending message...] -Отправка сообщения... -[Could not send the message!] -Ошибка отправки сообщения! - -; /MirandaG15.rc:IDD_FONTS -[Device:] -Клавиатура: -[No device attached] -Не присоединено -[Show softkey labels] -Показывать подписи кнопок -[Event log:] -Журнал событий: -[Message log:] -Журнал сообщений -[Contactlist:] -Список контактов -[Titles:] -Заголовки -[If the screensaver is active:] -Если активна заставка: -[Turn off backlights] -Выключить подсветку -[Lock the Screen] -Заблокировать экран -[If the applet is active:] -Если апплет активен: -[Use the VolumeWheel to scroll up and down (might affect system performance)] -Использовать колесо регулировки громкости для прокрутки списков - -[Use transition effects when changing screens] -Использовать эффекты при смене экранов -[For updates and news check the thread on http://www.g15forums.com] -Обновления и новости ищите в теме на http://www.g15forums.com -[Or visit http://www.mkleinhans.de] -Или посетите http://www.mkleinhans.de - -; /MirandaG15.rc:IDD_NOTIFICATIONS -[Chatsessions] -Беседы -[Exceptions:] -Исключения: -[Don't skip when repyling] -Не пропускать во время ответа -[Notification screen title] -Заголовок окна уведомления -[Hide it] -Без заголовка -[Show the plugin name] -Показывать имя плагина -[Show a short event summary] -Краткое содержание события -[Size of the log] -Размер журнала -[Notification duration] -Длительн. уведомления -[Notification types] -Типы уведомлений -[Contact signs off] -Контакт выходит из сети -[Contact changes status] -Контакт изменяет статус -[Contactlist events] -События сп. контактов -[Protocol disconnected] -Протокол отсоединен -[Protocol connected] -Протокол соединен -[Protocol status changes] -Изменен статус протокола -[Show only events from the following protocols:] -Показывать события только следующих протоколов: -[Contact signs on] -Контакт входит в сеть -[When a chatsession is active, skip the following notifications for that contact:] -Пропускать следующие уведомления для контакта, с которым активен разговор: -[Chatsession specific] -Только для сессии -[User events] -События польз. -[Emotes] -Эмоции -[Special IRC events:] -Только для IRC -[Channel events] -События канала -[Cutoff nicknames after] -Ограничить имена до -[Cutoff channelnames after] -Ограничить каналы до -[chars] -символов -[Show protocol labels] -Показывать протоколы - -; /MirandaG15.rc:IDD_CLIST -[Contactlist] -Список контактов -[Show the contacts protocols] -Показывать протоколы контактов -[Use ignore settings] -Учитывать игнорирование контактов -[Use groups/subgroups] -Учитывать игнорирование групп -[Grouped mode] -Режим групп -[Draw tree lines] -Рисовать линии дерева -[Show counters behind group names] -Показывать счётчики после названий групп -[Reset selection] -Сбросить выделение -[When opening the contactlist screen:] -При открытии экрана списка контактов: -[Don't change group states] -Не изменять состояния групп -[Collapse all groups] -Свернуть все группы -[Show only contacts from the following protocols:] -Показывать только контакты следующих протоколов: -[Protocol filter] -Фильтр протоколов -[Expand all groups] -Раскрыть все группы -[Use two columns] -Использовать две колонки -[Fade out selection rectangle] -Постепенно затемнять выделение - -; /MirandaG15.rc:IDD_CHAT -[Typing notifications] -Уведомления о наборе текста -[Show typing notifications] -Отображать -[Send typing notifications] -Отсылать -[When in background] -Когда в фоне -[Close chat after] -Закрывать чат после -[Maximizing] -Полный экран -[When maximized:] -При макс. размере: -[Hide title] -Скрывать заголовок -[Hide labels] -Скрывать метки -[Load only unread messages] -Загружать только непрочитанные сообщения -[Show only new messages] -Показывать только новые сообщения -[Mark incoming messages as read] -Отмечать входящие как прочитанные -[Maximized scrolling] -Прокрутка в режиме полного экрана -[Size of the log:] -Размер журнала: -[On incoming messages:] -При входящих сообщениях: -[Scroll to the first line] -К первой строке -[Scroll to the last line] -К последней строке -[Replying] -Ответ -[Show linebreak indicators] -Показывать символы переноса строки -[Send messages with return, insert linebreaks with ctrl+return] -Отправка сообщений по Enter, перевод строки по CTRL+Enter) -[Maximized replying] -Ответ в режиме полного экрана -[Provides an interface to use Miranda from the G15's LCD] -Плагин добавляет возможность использования Miranda IM на ЖК-экране клавиатуры Logitech G15 \ No newline at end of file diff --git a/langpacks/russian/Plugins/MirandaG15.txt b/langpacks/russian/Plugins/MirandaG15.txt new file mode 100644 index 0000000000..fbe8e1eb93 --- /dev/null +++ b/langpacks/russian/Plugins/MirandaG15.txt @@ -0,0 +1,232 @@ +#muuid {798221e1-e47a-4dc8-9077-1e576f9c4307} +;============================================================ +; File: MirandaG15.dll +; Plugin: MirandaG15 +; Version: 0.1.2.0 +; Authors: Martin Kleinhans +;============================================================ +[Timeout: No response from contact/server] +Таймаут: Нет ответа от контакта/сервера +[New message from %s] +Новое сообщение от %s +[Incoming URL from %s] +Новая ссылка от %s +[Incoming contacts from %s] +Новый контакт от %s +[You were added by %s] +%s добавил вас! +[Authrequest from %s] +Запрос авторизации от %s +[Incoming file from %s] +Входящий файл от %s +[%s has joined the channel] +%s Присоединился к каналу. +[%s has left: %s] +%s вышел: %s +[%s has disconnected: %s] +%s отсоединился: %s +[%s has kicked %s: %s] +%s выбросил %s: %s +[Topic is now '%s' (set by %s)] +Тема: "%s" (установил %s) +[%s enables '%s' for %s] +%s включает "%s" для %s +[%s disables '%s' for %s] +%s отключает "%s" для %s +[Joined %s] +Присоединились к %s +[%s signed on (%s)] +%s приходит (%s) +[Left %s] +Покинули %s +[%s signed off] +%s уходит +[Contactlist event] +Событие списка контактов +[You are now %s] +Вы теперь %s +[Protocol status change] +Изменение статуса протокола +[%s was deleted from contactlist!] +%s был удален из списка контактов! + +; /CChatScreen.cpp +[typing..] +набирает текст.. +[IRC-Chatroom support is disabled!\nYou need to install the patched IRC.dll (see the readme) to use IRC-Chatrooms on the LCD] +Поддержка чатов IRC отключена!\nВам нужно установить IRC.dll (смотрите Readme) для активации этой функции! +[Sending message...] +Отправка сообщения... +[Could not send the message!] +Ошибка отправки сообщения! + +; /MirandaG15.rc:IDD_FONTS +[Device:] +Клавиатура: +[No device attached] +Не присоединено +[Show softkey labels] +Показывать подписи кнопок +[Event log:] +Журнал событий: +[Message log:] +Журнал сообщений +[Contactlist:] +Список контактов +[Titles:] +Заголовки +[If the screensaver is active:] +Если активна заставка: +[Turn off backlights] +Выключить подсветку +[Lock the Screen] +Заблокировать экран +[If the applet is active:] +Если апплет активен: +[Use the VolumeWheel to scroll up and down (might affect system performance)] +Использовать колесо регулировки громкости для прокрутки списков + +[Use transition effects when changing screens] +Использовать эффекты при смене экранов +[For updates and news check the thread on http://www.g15forums.com] +Обновления и новости ищите в теме на http://www.g15forums.com +[Or visit http://www.mkleinhans.de] +Или посетите http://www.mkleinhans.de + +; /MirandaG15.rc:IDD_NOTIFICATIONS +[Chatsessions] +Беседы +[Exceptions:] +Исключения: +[Don't skip when repyling] +Не пропускать во время ответа +[Notification screen title] +Заголовок окна уведомления +[Hide it] +Без заголовка +[Show the plugin name] +Показывать имя плагина +[Show a short event summary] +Краткое содержание события +[Size of the log] +Размер журнала +[Notification duration] +Длительн. уведомления +[Notification types] +Типы уведомлений +[Contact signs off] +Контакт выходит из сети +[Contact changes status] +Контакт изменяет статус +[Contactlist events] +События сп. контактов +[Protocol disconnected] +Протокол отсоединен +[Protocol connected] +Протокол соединен +[Protocol status changes] +Изменен статус протокола +[Show only events from the following protocols:] +Показывать события только следующих протоколов: +[Contact signs on] +Контакт входит в сеть +[When a chatsession is active, skip the following notifications for that contact:] +Пропускать следующие уведомления для контакта, с которым активен разговор: +[Chatsession specific] +Только для сессии +[User events] +События польз. +[Emotes] +Эмоции +[Special IRC events:] +Только для IRC +[Channel events] +События канала +[Cutoff nicknames after] +Ограничить имена до +[Cutoff channelnames after] +Ограничить каналы до +[chars] +символов +[Show protocol labels] +Показывать протоколы + +; /MirandaG15.rc:IDD_CLIST +[Contactlist] +Список контактов +[Show the contacts protocols] +Показывать протоколы контактов +[Use ignore settings] +Учитывать игнорирование контактов +[Use groups/subgroups] +Учитывать игнорирование групп +[Grouped mode] +Режим групп +[Draw tree lines] +Рисовать линии дерева +[Show counters behind group names] +Показывать счётчики после названий групп +[Reset selection] +Сбросить выделение +[When opening the contactlist screen:] +При открытии экрана списка контактов: +[Don't change group states] +Не изменять состояния групп +[Collapse all groups] +Свернуть все группы +[Show only contacts from the following protocols:] +Показывать только контакты следующих протоколов: +[Protocol filter] +Фильтр протоколов +[Expand all groups] +Раскрыть все группы +[Use two columns] +Использовать две колонки +[Fade out selection rectangle] +Постепенно затемнять выделение + +; /MirandaG15.rc:IDD_CHAT +[Typing notifications] +Уведомления о наборе текста +[Show typing notifications] +Отображать +[Send typing notifications] +Отсылать +[When in background] +Когда в фоне +[Close chat after] +Закрывать чат после +[Maximizing] +Полный экран +[When maximized:] +При макс. размере: +[Hide title] +Скрывать заголовок +[Hide labels] +Скрывать метки +[Load only unread messages] +Загружать только непрочитанные сообщения +[Show only new messages] +Показывать только новые сообщения +[Mark incoming messages as read] +Отмечать входящие как прочитанные +[Maximized scrolling] +Прокрутка в режиме полного экрана +[Size of the log:] +Размер журнала: +[On incoming messages:] +При входящих сообщениях: +[Scroll to the first line] +К первой строке +[Scroll to the last line] +К последней строке +[Replying] +Ответ +[Show linebreak indicators] +Показывать символы переноса строки +[Send messages with return, insert linebreaks with ctrl+return] +Отправка сообщений по Enter, перевод строки по CTRL+Enter) +[Maximized replying] +Ответ в режиме полного экрана +[Provides an interface to use Miranda from the LCD of various Logitech devices.] +Плагин добавляет возможность использования Miranda NG на ЖК-экране различных устройств Logitech. \ No newline at end of file diff --git a/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj b/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj index b22f3076fd..fd65d770e4 100644 --- a/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj +++ b/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj @@ -167,10 +167,6 @@ - - - - diff --git a/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj.filters b/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj.filters index 34bf8dd788..64d294b0ec 100644 --- a/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj.filters +++ b/plugins/MirandaG15/LCDFramework/LCDFramework_10.vcxproj.filters @@ -138,8 +138,4 @@ Header Files\LCDObjects - - - - \ No newline at end of file diff --git a/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj b/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj index a5afbccac8..b254e11128 100644 --- a/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj +++ b/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj @@ -175,10 +175,6 @@ - - - - diff --git a/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj.filters b/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj.filters index 34bf8dd788..64d294b0ec 100644 --- a/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj.filters +++ b/plugins/MirandaG15/LCDFramework/LCDFramework_11.vcxproj.filters @@ -138,8 +138,4 @@ Header Files\LCDObjects - - - - \ No newline at end of file diff --git a/plugins/MirandaG15/MirandaG15_10.vcxproj b/plugins/MirandaG15/MirandaG15_10.vcxproj index a0d8a757d3..1670673154 100644 --- a/plugins/MirandaG15/MirandaG15_10.vcxproj +++ b/plugins/MirandaG15/MirandaG15_10.vcxproj @@ -245,6 +245,7 @@ + @@ -282,6 +283,7 @@ + diff --git a/plugins/MirandaG15/MirandaG15_10.vcxproj.filters b/plugins/MirandaG15/MirandaG15_10.vcxproj.filters index c4fd2901b0..a50d8fb337 100644 --- a/plugins/MirandaG15/MirandaG15_10.vcxproj.filters +++ b/plugins/MirandaG15/MirandaG15_10.vcxproj.filters @@ -122,6 +122,9 @@ Header Files + + Header Files + @@ -225,5 +228,8 @@ Resource Files + + Resource Files + \ No newline at end of file diff --git a/plugins/MirandaG15/MirandaG15_11.vcxproj b/plugins/MirandaG15/MirandaG15_11.vcxproj index 2499ab90f4..8bd9c2f823 100644 --- a/plugins/MirandaG15/MirandaG15_11.vcxproj +++ b/plugins/MirandaG15/MirandaG15_11.vcxproj @@ -253,6 +253,7 @@ + @@ -290,6 +291,7 @@ + diff --git a/plugins/MirandaG15/MirandaG15_11.vcxproj.filters b/plugins/MirandaG15/MirandaG15_11.vcxproj.filters index c4fd2901b0..a50d8fb337 100644 --- a/plugins/MirandaG15/MirandaG15_11.vcxproj.filters +++ b/plugins/MirandaG15/MirandaG15_11.vcxproj.filters @@ -122,6 +122,9 @@ Header Files + + Header Files + @@ -225,5 +228,8 @@ Resource Files + + Resource Files + \ No newline at end of file diff --git a/plugins/MirandaG15/res/Version.rc b/plugins/MirandaG15/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/MirandaG15/res/Version.rc @@ -0,0 +1,38 @@ +// Microsoft Visual C++ generated resource script. +// +#ifdef APSTUDIO_INVOKED +#error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + +#include "afxres.h" +#include "..\src\version.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/plugins/MirandaG15/src/Miranda.cpp b/plugins/MirandaG15/src/Miranda.cpp index 0d7d0700a4..dbe2c4da9f 100644 --- a/plugins/MirandaG15/src/Miranda.cpp +++ b/plugins/MirandaG15/src/Miranda.cpp @@ -66,18 +66,18 @@ int hLangpack; extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_G15APPLET, MIID_LAST}; -static PLUGININFOEX pluginInfo = { +PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), - APP_NAME, - PLUGIN_MAKE_VERSION(0,1,2,0), - "Provides an interface to use Miranda from the LCD of various Logitech devices", - "Martin Kleinhans", - "mail@mkleinhans.de", - " 2009 Martin Kleinhans", - "http://www.mkleinhans.de", - UNICODE_AWARE, // not transient + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, // {798221E1-E47A-4dc8-9077-1E576F9C4307} - { 0x798221e1, 0xe47a, 0x4dc8, { 0x90, 0x77, 0x1e, 0x57, 0x6f, 0x9c, 0x43, 0x7 } } + {0x798221e1, 0xe47a, 0x4dc8, {0x90, 0x77, 0x1e, 0x57, 0x6f, 0x9c, 0x43, 0x7}} }; // Function Prototypes @@ -90,7 +90,7 @@ void UnInit(); extern "C" { __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - return &pluginInfo; + return &pluginInfoEx; } // Called by Miranda to load the plugin. diff --git a/plugins/MirandaG15/src/StdAfx.h b/plugins/MirandaG15/src/StdAfx.h index d55627ae74..cffc743a0c 100644 --- a/plugins/MirandaG15/src/StdAfx.h +++ b/plugins/MirandaG15/src/StdAfx.h @@ -1,8 +1,7 @@ #ifndef _STDAFX_H_ #define _STDAFX_H_ -#define APP_NAME "MirandaG15" -#define APP_SHORTNAME "MirandaG15" +#define APP_SHORTNAME __PLUGIN_NAME /* Common header files */ #include @@ -49,5 +48,6 @@ using namespace std; #include "CEvent.h" #include "resource.h" +#include "version.h" #endif \ No newline at end of file diff --git a/plugins/MirandaG15/src/Version.h b/plugins/MirandaG15/src/Version.h new file mode 100644 index 0000000000..0c30c5114a --- /dev/null +++ b/plugins/MirandaG15/src/Version.h @@ -0,0 +1,14 @@ +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 1 +#define __RELEASE_NUM 2 +#define __BUILD_NUM 0 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "MirandaG15" +#define __FILENAME "MirandaG15.dll" +#define __DESCRIPTION "Provides an interface to use Miranda from the LCD of various Logitech devices." +#define __AUTHOR "Martin Kleinhans" +#define __AUTHOREMAIL "mail@mkleinhans.de" +#define __AUTHORWEB "http://miranda-ng.org/p/MirandaG15/" +#define __COPYRIGHT " 2009 Martin Kleinhans" diff --git a/plugins/MirandaG15/src/m_metacontacts.h b/plugins/MirandaG15/src/m_metacontacts.h deleted file mode 100644 index 9f348bd2c6..0000000000 --- a/plugins/MirandaG15/src/m_metacontacts.h +++ /dev/null @@ -1,166 +0,0 @@ -/* - -Miranda IM: the free IM client for Microsoft* Windows* - -Copyright 2004 Universite Louis PASTEUR, STRASBOURG. -Copyright 2004 Scott Ellis (www.scottellis.com.au mail@scottellis.com.au) - -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. -*/ - -#ifndef M_METACONTACTS_H__ -#define M_METACONTACTS_H__ 1 - -#ifndef MIID_METACONTACTS -#define MIID_METACONTACTS {0xc0325019, 0xc1a7, 0x40f5, { 0x83, 0x65, 0x4f, 0x46, 0xbe, 0x21, 0x86, 0x3e}} -#endif - -//get the handle for a contact's parent metacontact -//wParam=(HANDLE)hSubContact -//lParam=0 -//returns a handle to the parent metacontact, or null if this contact is not a subcontact -#define MS_MC_GETMETACONTACT "MetaContacts/GetMeta" - -//gets the handle for the default contact -//wParam=(HANDLE)hMetaContact -//lParam=0 -//returns a handle to the default contact, or null on failure -#define MS_MC_GETDEFAULTCONTACT "MetaContacts/GetDefault" - -//gets the contact number for the default contact -//wParam=(HANDLE)hMetaContact -//lParam=0 -//returns a DWORD contact number, or -1 on failure -#define MS_MC_GETDEFAULTCONTACTNUM "MetaContacts/GetDefaultNum" - -//gets the handle for the 'most online' contact -//wParam=(HANDLE)hMetaContact -//lParam=0 -//returns a handle to the 'most online' contact -#define MS_MC_GETMOSTONLINECONTACT "MetaContacts/GetMostOnline" - -//gets the number of subcontacts for a metacontact -//wParam=(HANDLE)hMetaContact -//lParam=0 -//returns a DWORD representing the number of subcontacts for the given metacontact -#define MS_MC_GETNUMCONTACTS "MetaContacts/GetNumContacts" - -//gets the handle of a subcontact, using the subcontact's number -//wParam=(HANDLE)hMetaContact -//lParam=(DWORD)contact number -//returns a handle to the specified subcontact -#define MS_MC_GETSUBCONTACT "MetaContacts/GetSubContact" - -//sets the default contact, using the subcontact's contact number -//wParam=(HANDLE)hMetaContact -//lParam=(DWORD)contact number -//returns 0 on success -#define MS_MC_SETDEFAULTCONTACTNUM "MetaContacts/SetDefault" - -//sets the default contact, using the subcontact's handle -//wParam=(HANDLE)hMetaContact -//lParam=(HANDLE)hSubcontact -//returns 0 on success -#define MS_MC_SETDEFAULTCONTACT "MetaContacts/SetDefaultByHandle" - -//forces the metacontact to send using a specific subcontact, using the subcontact's contact number -//wParam=(HANDLE)hMetaContact -//lParam=(DWORD)contact number -//returns 0 on success -#define MS_MC_FORCESENDCONTACTNUM "MetaContacts/ForceSendContact" - -//forces the metacontact to send using a specific subcontact, using the subcontact's handle -//wParam=(HANDLE)hMetaContact -//lParam=(HANDLE)hSubcontact -//returns 0 on success (will fail if 'force default' is in effect) -#define MS_MC_FORCESENDCONTACT "MetaContacts/ForceSendContactByHandle" - -//'unforces' the metacontact to send using a specific subcontact -//wParam=(HANDLE)hMetaContact -//lParam=0 -//returns 0 on success (will fail if 'force default' is in effect) -#define MS_MC_UNFORCESENDCONTACT "MetaContacts/UnforceSendContact" - -//'forces' or 'unforces' (i.e. toggles) the metacontact to send using it's default contact -// overrides (and clears) 'force send' above, and will even force use of offline contacts -// will send ME_MC_FORCESEND or ME_MC_UNFORCESEND event -//wParam=(HANDLE)hMetaContact -//lParam=0 -//returns 1(true) or 0(false) representing new state of 'force default' -#define MS_MC_FORCEDEFAULT "MetaContacts/ForceSendDefault" - -// method to get state of 'force' for a metacontact -// wParam=(HANDLE)hMetaContact -// lParam= (DWORD)&contact_number or NULL -// -// if lparam supplied, the contact_number of the contatct 'in force' will be copied to the address it points to, -// or if none is in force, the value (DWORD)-1 will be copied -// (v0.8.0.8+ returns 1 if 'force default' is true with *lParam == default contact number, else returns 0 with *lParam as above) -#define MS_MC_GETFORCESTATE "MetaContacts/GetForceState" - -// fired when a metacontact's default contact changes (fired upon creation of metacontact also, when default is initially set) -// wParam=(HANDLE)hMetaContact -// lParam=(HANDLE)hDefaultContact -#define ME_MC_DEFAULTTCHANGED "MetaContacts/DefaultChanged" - -// fired when a metacontact's subcontacts change (fired upon creation of metacontact, when contacts are added or removed, and when -// contacts are reordered) - a signal to re-read metacontact data -// wParam=(HANDLE)hMetaContact -// lParam=0 -#define ME_MC_SUBCONTACTSCHANGED "MetaContacts/SubcontactsChanged" - -// fired when a metacontact is forced to send using a specific subcontact -// wParam=(HANDLE)hMetaContact -// lParam=(HANDLE)hForceContact -#define ME_MC_FORCESEND "MetaContacts/ForceSend" - -// fired when a metacontact is 'unforced' to send using a specific subcontact -// wParam=(HANDLE)hMetaContact -// lParam=0 -#define ME_MC_UNFORCESEND "MetaContacts/UnforceSend" - -// method to get protocol name - used to be sure you're dealing with a "real" metacontacts plugin :) -// wParam=lParam=0 -#define MS_MC_GETPROTOCOLNAME "MetaContacts/GetProtoName" - - -// added 0.9.5.0 (22/3/05) -// wParam=(HANDLE)hContact -// lParam=0 -// convert a given contact into a metacontact -#define MS_MC_CONVERTTOMETA "MetaContacts/ConvertToMetacontact" - -// added 0.9.5.0 (22/3/05) -// wParam=(HANDLE)hContact -// lParam=(HANDLE)hMeta -// add an existing contact to a metacontact -#define MS_MC_ADDTOMETA "MetaContacts/AddToMetacontact" - -// added 0.9.5.0 (22/3/05) -// wParam=0 -// lParam=(HANDLE)hContact -// remove a contact from a metacontact -#define MS_MC_REMOVEFROMMETA "MetaContacts/RemoveFromMetacontact" - - -// added 0.9.13.2 (6/10/05) -// wParam=(BOOL)disable -// lParam=0 -// enable/disable the 'hidden group hack' - for clists that support subcontact hiding using 'IsSubcontact' setting -// should be called once in the clist 'onmodulesloaded' event handler (which, since it's loaded after the db, will be called -// before the metacontact onmodulesloaded handler where the subcontact hiding is usually done) -#define MS_MC_DISABLEHIDDENGROUP "MetaContacts/DisableHiddenGroup" - -#endif -- cgit v1.2.3