linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3040
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2012-09-09 16:31:02 +0200
message:
  add main chat logging to per-hub settings
modified:
  dcpp/HubSettings.cpp
  dcpp/HubSettings.h
  dcpp/PluginDefs.h
  dcpp/SettingsManager.cpp
  win32/FavHubGroupsDlg.cpp
  win32/FavHubGroupsDlg.h
  win32/FavHubProperties.cpp
  win32/FavHubProperties.h
  win32/HubFrame.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/HubSettings.cpp'
--- dcpp/HubSettings.cpp	2012-05-27 12:53:12 +0000
+++ dcpp/HubSettings.cpp	2012-09-09 14:31:02 +0000
@@ -25,7 +25,7 @@
 	"Nick", "UserDescription", "Email", "UserIp" // not "Description" for compat with prev fav hub lists
 };
 const string HubSettings::boolNames[BoolCount] = {
-	"ShowJoins", "FavShowJoins"
+	"ShowJoins", "FavShowJoins", "LogMainChat"
 };
 
 namespace {

=== modified file 'dcpp/HubSettings.h'
--- dcpp/HubSettings.h	2012-05-27 12:53:12 +0000
+++ dcpp/HubSettings.h	2012-09-09 14:31:02 +0000
@@ -49,6 +49,7 @@
 
 		ShowJoins = HubBoolFirst,
 		FavShowJoins,
+		LogMainChat,
 		// don't forget to edit boolNames in HubSettings.cpp when adding a def here!
 
 		HubBoolLast

=== modified file 'dcpp/PluginDefs.h'
--- dcpp/PluginDefs.h	2012-09-08 13:54:40 +0000
+++ dcpp/PluginDefs.h	2012-09-09 14:31:02 +0000
@@ -96,7 +96,7 @@
 #define HOOK_QUEUE_FINISHED			"dcpp.queue.onFinished"		/* Item has just finished downloading (obj: QueueData) */
 
 #define HOOK_UI_CREATED				"dcpp.ui.onCreated"				/* Host application UI has been created (obj: if any, impl. dependant) */
-#define HOOK_UI_CHAT_TAGS			"dcpp.ui.onTags"				/* Chat message tags before tag merging (obj: UserData; data: TagData) */
+#define HOOK_UI_CHAT_TAGS			"dcpp.ui.onChatTags"			/* Chat message tags before tag merging (obj: UserData; data: TagData) */
 #define HOOK_UI_CHAT_DISPLAY		"dcpp.ui.onChatDisplay"			/* Chat messages before they are displayed in chat (obj: UserData; data: StringData) */
 #define HOOK_UI_PROCESS_CHAT_CMD	"dcpp.ui.onProcessCmd"			/* Client side commands in chat (obj: HubData/UserData; data: CommandData) */
 

=== modified file 'dcpp/SettingsManager.cpp'
--- dcpp/SettingsManager.cpp	2012-09-03 19:14:25 +0000
+++ dcpp/SettingsManager.cpp	2012-09-09 14:31:02 +0000
@@ -601,6 +601,7 @@
 	ret.get(HubSettings::Email) = get(EMAIL);
 	ret.get(HubSettings::ShowJoins) = get(SHOW_JOINS);
 	ret.get(HubSettings::FavShowJoins) = get(FAV_SHOW_JOINS);
+	ret.get(HubSettings::LogMainChat) = get(LOG_MAIN_CHAT);
 	return ret;
 }
 

=== modified file 'win32/FavHubGroupsDlg.cpp'
--- win32/FavHubGroupsDlg.cpp	2012-09-03 19:14:25 +0000
+++ win32/FavHubGroupsDlg.cpp	2012-09-09 14:31:02 +0000
@@ -53,6 +53,7 @@
 userIp(0),
 showJoins(0),
 favShowJoins(0),
+logMainChat(0),
 parentEntry(parentEntry_)
 {
 	onInitDialog([this] { return handleInitDialog(); });
@@ -151,7 +152,7 @@
 		}
 
 		{
-			auto cur2 = cur->addChild(Grid::Seed(2, 2));
+			auto cur2 = cur->addChild(Grid::Seed(3, 2));
 			cur2->column(0).mode = GridInfo::FILL;
 			cur2->column(0).align = GridInfo::BOTTOM_RIGHT;
 
@@ -164,6 +165,11 @@
 			favShowJoins = cur2->addChild(WinUtil::Seeds::Dialog::comboBox);
 			WinUtil::fillTriboolCombo(favShowJoins);
 			favShowJoins->setSelected(0);
+
+			cur2->addChild(Label::Seed(T_("Log main chat")));
+			logMainChat = cur2->addChild(WinUtil::Seeds::Dialog::comboBox);
+			WinUtil::fillTriboolCombo(logMainChat);
+			logMainChat->setSelected(0);
 		}
 	}
 
@@ -231,6 +237,7 @@
 	userIp->setText(Text::toT(settings.get(HubSettings::UserIp)));
 	showJoins->setSelected(toInt(settings.get(HubSettings::ShowJoins)));
 	favShowJoins->setSelected(toInt(settings.get(HubSettings::FavShowJoins)));
+	logMainChat->setSelected(toInt(settings.get(HubSettings::LogMainChat)));
 }
 
 void FavHubGroupsDlg::handleAdd() {
@@ -292,6 +299,7 @@
 	settings.get(HubSettings::UserIp) = Text::fromT(userIp->getText());
 	settings.get(HubSettings::ShowJoins) = to3bool(showJoins->getSelected());
 	settings.get(HubSettings::FavShowJoins) = to3bool(favShowJoins->getSelected());
+	settings.get(HubSettings::LogMainChat) = to3bool(logMainChat->getSelected());
 	return settings;
 }
 

=== modified file 'win32/FavHubGroupsDlg.h'
--- win32/FavHubGroupsDlg.h	2012-05-23 22:05:22 +0000
+++ win32/FavHubGroupsDlg.h	2012-09-09 14:31:02 +0000
@@ -80,6 +80,7 @@
 	TextBoxPtr userIp;
 	ComboBoxPtr showJoins;
 	ComboBoxPtr favShowJoins;
+	ComboBoxPtr logMainChat;
 
 	FavoriteHubEntry* parentEntry;
 

=== modified file 'win32/FavHubProperties.cpp'
--- win32/FavHubProperties.cpp	2012-09-03 19:14:25 +0000
+++ win32/FavHubProperties.cpp	2012-09-09 14:31:02 +0000
@@ -48,6 +48,7 @@
 userIp(0),
 showJoins(0),
 favShowJoins(0),
+logMainChat(0),
 groups(0),
 entry(_entry)
 {
@@ -129,7 +130,7 @@
 	}
 
 	{
-		auto cur = grid->addChild(Grid::Seed(2, 2));
+		auto cur = grid->addChild(Grid::Seed(3, 2));
 		grid->setWidget(cur, 2, 0, 1, 2);
 		cur->column(0).mode = GridInfo::FILL;
 		cur->column(0).align = GridInfo::BOTTOM_RIGHT;
@@ -143,6 +144,11 @@
 		favShowJoins = cur->addChild(WinUtil::Seeds::Dialog::comboBox);
 		WinUtil::fillTriboolCombo(favShowJoins);
 		favShowJoins->setSelected(toInt(entry->get(HubSettings::FavShowJoins)));
+
+		cur->addChild(Label::Seed(T_("Log main chat")));
+		logMainChat = cur->addChild(WinUtil::Seeds::Dialog::comboBox);
+		WinUtil::fillTriboolCombo(logMainChat);
+		logMainChat->setSelected(toInt(entry->get(HubSettings::LogMainChat)));
 	}
 
 	{
@@ -192,6 +198,7 @@
 	entry->get(HubSettings::UserIp) = Text::fromT(userIp->getText());
 	entry->get(HubSettings::ShowJoins) = to3bool(showJoins->getSelected());
 	entry->get(HubSettings::FavShowJoins) = to3bool(favShowJoins->getSelected());
+	entry->get(HubSettings::LogMainChat) = to3bool(logMainChat->getSelected());
 	entry->setGroup(Text::fromT(groups->getText()));
 	FavoriteManager::getInstance()->save();
 	endDialog(IDOK);

=== modified file 'win32/FavHubProperties.h'
--- win32/FavHubProperties.h	2012-05-23 22:05:22 +0000
+++ win32/FavHubProperties.h	2012-09-09 14:31:02 +0000
@@ -40,6 +40,7 @@
 	TextBoxPtr userIp;
 	ComboBoxPtr showJoins;
 	ComboBoxPtr favShowJoins;
+	ComboBoxPtr logMainChat;
 	ComboBoxPtr groups;
 
 	FavoriteHubEntry *entry;

=== modified file 'win32/HubFrame.cpp'
--- win32/HubFrame.cpp	2012-09-09 14:05:30 +0000
+++ win32/HubFrame.cpp	2012-09-09 14:31:02 +0000
@@ -560,7 +560,7 @@
 	}
 	setDirty(SettingsManager::BOLD_HUB);
 
-	if(SETTING(LOG_MAIN_CHAT)) {
+	if(client->get(HubSettings::LogMainChat)) {
 		ParamMap params;
 		params["message"] = [&message] { return Text::toDOS(Text::fromT(message)); };
 		client->getHubIdentity().getParams(params, "hub", false);