notifer second round: get rid of old options file and added a new menu entry + misc fixes

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3326 17fca916-40b9-46aa-a4ea-0a15b648b75c

5 files changed, 49 insertions, 70 deletions

diff --git a/src/modules/options/CMakeLists.txt b/src/modules/options/CMakeLists.txt
index 3312c8a0d..eb96bbeaa 100644
--- a/src/modules/options/CMakeLists.txt
+++ b/src/modules/options/CMakeLists.txt
@@ -27,6 +27,7 @@ SET(kvioptions_MOC_HDRS
 	optw_messages.h
 	optw_nickserv.h
 	optw_notify.h
+	optw_notifier.h
 	optw_protection.h
 	optw_proxy.h
 	optw_query.h
@@ -72,6 +73,7 @@ SET(kvioptions_SRCS
 	optw_messages.cpp
 	optw_nickserv.cpp
 	optw_notify.cpp
+	optw_notifier.cpp
 	optw_protection.cpp
 	optw_proxy.cpp
 	optw_query.cpp
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index 380b61163..ecdec5347 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -53,6 +53,7 @@
 #include "optw_mediatypes.h"
 #include "optw_messages.h"
 #include "optw_nickserv.h"
+#include "optw_notifier.h"
 #include "optw_notify.h"
 #include "optw_protection.h"
 #include "optw_proxy.h"
@@ -355,9 +356,9 @@ KviOptionsWidget * classKviNickServOptionsWidget_createInstanceProc(QWidget * pa
 	return new KviNickServOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviNotifyOptionsWidget_createInstanceProc(QWidget * parent)
+KviOptionsWidget * classKviNotifierLookOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviNotifyOptionsWidget(parent);
+	return new KviNotifierLookOptionsWidget(parent);
 }
 
 KviOptionsWidget * classKviNotifierOptionsWidget_createInstanceProc(QWidget * parent)
@@ -365,6 +366,11 @@ KviOptionsWidget * classKviNotifierOptionsWidget_createInstanceProc(QWidget * pa
 	return new KviNotifierOptionsWidget(parent);
 }
 
+KviOptionsWidget * classKviNotifyOptionsWidget_createInstanceProc(QWidget * parent)
+{
+	return new KviNotifyOptionsWidget(parent);
+}
+
 KviOptionsWidget * classKviProtectionOptionsWidget_createInstanceProc(QWidget * parent)
 {
 	return new KviProtectionOptionsWidget(parent);
@@ -604,10 +610,12 @@ static const char * g_szName_KviStandardColorsOptionsWidget = KVI_OPTIONS_WIDGET
 static const char * g_szClassName_KviStandardColorsOptionsWidget = "KviStandardColorsOptionsWidget";
 static const char * g_szName_KviNickServOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNickServOptionsWidget;
 static const char * g_szClassName_KviNickServOptionsWidget = "KviNickServOptionsWidget";
-static const char * g_szName_KviNotifyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNotifyOptionsWidget;
-static const char * g_szClassName_KviNotifyOptionsWidget = "KviNotifyOptionsWidget";
+static const char * g_szName_KviNotifierLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNotifierLookOptionsWidget;
+static const char * g_szClassName_KviNotifierLookOptionsWidget = "KviNotifierLookOptionsWidget";
 static const char * g_szName_KviNotifierOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNotifierOptionsWidget;
 static const char * g_szClassName_KviNotifierOptionsWidget = "KviNotifierOptionsWidget";
+static const char * g_szName_KviNotifyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNotifyOptionsWidget;
+static const char * g_szClassName_KviNotifyOptionsWidget = "KviNotifyOptionsWidget";
 static const char * g_szName_KviProtectionOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviProtectionOptionsWidget;
 static const char * g_szClassName_KviProtectionOptionsWidget = "KviProtectionOptionsWidget";
 static const char * g_szName_KviProxyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviProxyOptionsWidget;
@@ -3084,6 +3092,40 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->pChildList = 0;
 
 	e0 = new KviOptionsWidgetInstanceEntry;
+	e0->createProc = &classKviNotifierLookOptionsWidget_createInstanceProc;
+	e0->pWidget = 0;
+	e0->szClassName = g_szClassName_KviNotifierLookOptionsWidget;
+	e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviNotifierLookOptionsWidget;
+	#ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviNotifierLookOptionsWidget
+	e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviNotifierLookOptionsWidget;
+	#else
+	e0->iPriority = 0;
+	#endif
+	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifierLookOptionsWidget
+	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifierLookOptionsWidget;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
+	#endif
+	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviNotifierLookOptionsWidget
+	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviNotifierLookOptionsWidget;
+	#else
+	e0->szGroup = "general";
+	#endif
+	#ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviNotifierLookOptionsWidget
+	e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviNotifierLookOptionsWidget;
+	#else
+	e0->bIsContainer = false;
+	#endif
+	#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviNotifierLookOptionsWidget
+	e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviNotifierLookOptionsWidget;
+	#else
+	e0->bIsNotContained = false;
+	#endif
+	e0->szNameNoLocale = g_szName_KviNotifierLookOptionsWidget;
+	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviNotifierLookOptionsWidget,"options");
+	m_pInstanceTree->append(e0);
+	e0->pChildList = 0;
+
+	e0 = new KviOptionsWidgetInstanceEntry;
 	e0->createProc = &classKviServerOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviServerOptionsWidget;
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index eaef406b0..66df2bfa9 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -32,7 +32,7 @@
 KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent)
 {
-	setObjectName("ircviewlook_options_widget");
+	setObjectName("inputlook_options_widget");
 	createLayout();
 
 	addFontSelector(0,0,1,0,__tr2qs_ctx("Font","options"),KviOption_fontInput);
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index ef3963f61..dc79ffc0e 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -102,58 +102,6 @@ KviNotifyOptionsWidget::~KviNotifyOptionsWidget()
 {
 }
 
-
-KviNotifierOptionsWidget::KviNotifierOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
-{
-	setObjectName("notifier_options_widget");
-
-	createLayout();
-
-	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable the notifier","options"),KviOption_boolEnableNotifier);
-	QString tip = "<center>";
-	tip += __tr2qs_ctx("This is an option for the impatient: it allows to forcibly and permanently disable " \
-					"the notifier window. Please note that if this option is activated then " \
-					"the notifier will NOT popup even if all the other options around specify " \
-					"to use it in response to particular events. Also note that this option " \
-					"will make all the /notifier.* commands fail silently.","options");
-	tip += "</center>";
-	mergeTip(b,tip);
-	addBoolSelector(0,1,0,1,__tr2qs_ctx("Enable notifier window flashing","options"),KviOption_boolNotifierFlashing);
-	KviBoolSelector * b2 = addBoolSelector(0,2,0,2,__tr2qs_ctx("Enable notifier window fade effect","options"),KviOption_boolNotifierFading);
-
-	KviTalGroupBox *g = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Advanced configuration","options"));
-	connect(b,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool)));
-
-	connect(b,
-		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("Default auto hiding time for messages (0 to disable)","options"),
-				KviOption_uintNotifierAutoHideTime,
-				0,86400,30,KVI_OPTION_BOOL(KviOption_boolEnableNotifier)),
-		SLOT(setEnabled(bool)));
-
-	connect(b2,
-		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("Notifier window opacity while active (mouseover)","options"),
-				KviOption_uintNotifierActiveTransparency,
-				0,100,90,KVI_OPTION_BOOL(KviOption_boolNotifierFading)),
-		SLOT(setEnabled(bool)));
-
-	connect(b2,
-		SIGNAL(toggled(bool)),
-		addUIntSelector(g,__tr2qs_ctx("Notifier window opacity while inactive","options"),
-				KviOption_uintNotifierInactiveTransparency,
-				0,100,40,KVI_OPTION_BOOL(KviOption_boolNotifierFading)),
-		SLOT(setEnabled(bool)));
-
-	addRowSpacer(0,4,0,4);
-}
-
-KviNotifierOptionsWidget::~KviNotifierOptionsWidget()
-{
-}
-
-
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_optw_notify.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_notify.h b/src/modules/options/optw_notify.h
index 926c9a07d..fe321af82 100644
--- a/src/modules/options/optw_notify.h
+++ b/src/modules/options/optw_notify.h
@@ -40,17 +40,4 @@ public:
 	~KviNotifyOptionsWidget();
 };
 
-#define KVI_OPTIONS_WIDGET_ICON_KviNotifierOptionsWidget KVI_SMALLICON_ALERT
-#define KVI_OPTIONS_WIDGET_NAME_KviNotifierOptionsWidget __tr2qs_no_lookup("Notifier")
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifierOptionsWidget __tr2qs_no_lookup("popup")
-#define KVI_OPTIONS_WIDGET_PARENT_KviNotifierOptionsWidget KviInterfaceFeaturesOptionsWidget
-
-class KviNotifierOptionsWidget : public KviOptionsWidget
-{
-	Q_OBJECT
-public:
-	KviNotifierOptionsWidget(QWidget * parent);
-	~KviNotifierOptionsWidget();
-};
-
 #endif //_OPTW_NOTIFY_H_