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

8 files changed, 74 insertions, 161 deletions

diff --git a/src/modules/notifier/libkvinotifier.kvc b/src/modules/notifier/libkvinotifier.kvc
deleted file mode 100644
index 4625fe3b1..000000000
--- a/src/modules/notifier/libkvinotifier.kvc
+++ /dev/null
@@ -1,28 +0,0 @@
-[NotifierSkin]
-CloseX=233
-CloseY=5
-PrevX=233
-PrevY=26
-NextX=233
-NextY=82
-WriteX=233
-WriteY=103
-TextRect=6,22,223,97
-TitleRect=6,5,223,20
-TextFontFamily=Arial
-TextFontSize=9
-TitleFontFamily=Arial
-TitleFontSize=9
-CurTextColor=45,0,0
-OldTextColor1=40,20,20
-OldTextColor2=40,40,40
-OldTextColor3=60,60,60
-OldTextColor4=85,85,85
-OldTextColor5=90,90,90
-OldTextColor6=95,95,95
-HistoricTextColor=125,125,125
-TitleColor=120,70,70
-InputFontFamily=Arial
-InputFontSize=9
-InputHeight=19
-BlinkTimeout=650
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 6f1462d28..e837225fc 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -87,37 +87,6 @@ KviNotifierWindow::KviNotifierWindow()
 
 	m_pWndBorder = new KviNotifierWindowBorder();
 
-	reloadImages();
-
-	QString buffer;
-	g_pApp->getReadOnlyConfigPath(buffer,"libkvinotifier.kvc",KviApp::ConfigPlugins,true);
-
-	KviConfig cfg(buffer,KviConfig::Read);
-
-	cfg.setGroup("NotifierSkin");
-
-	QString szFamily = cfg.readEntry("TextFontFamily","Arial");
-	m_pDefaultFont = new QFont(szFamily,cfg.readIntEntry("TextFontSize",9));
-	setFont(*m_pDefaultFont);
-
-	szFamily = cfg.readEntry("TitleFontFamily","Arial");
-	m_pTitleFont = new QFont(szFamily,cfg.readIntEntry("TitleFontSize",9));
-
-	m_clrCurText = cfg.readColorEntry("CurTextColor",QColor(40,0,0));
-	m_clrHistoricText = cfg.readColorEntry("HistoricTextColor",QColor(125,125,125));
-	m_clrTitle = QColor(255,255,255);
-	for(int i=0;i<NUM_OLD_COLORS;i++)
-	{
-		KviStr szKey;
-		szKey.sprintf("OldTextColor%d",i + 1);
-		m_clrOldText[i] = cfg.readColorEntry(szKey.ptr(),QColor(90,90,90));
-	}
-
-	m_iBlinkTimeout = cfg.readIntEntry("BlinkTimeout",650);
-	if(m_iBlinkTimeout < 100)m_iBlinkTimeout = 100;
-	m_iInputHeight = cfg.readIntEntry("InputHeight",20);
-	if(m_iInputHeight < 10)m_iInputHeight = 10;
-
 	setFocusPolicy(Qt::NoFocus);
 	setMouseTracking(true);
 
@@ -169,8 +138,7 @@ KviNotifierWindow::KviNotifierWindow()
 	m_pLineEdit->installEventFilter(this);
 	connect(m_pLineEdit,SIGNAL(returnPressed()),this,SLOT(returnPressed()));
 
-	szFamily = cfg.readEntry("InputFontFamily","Arial");
-	m_pLineEdit->setFont(QFont(szFamily,cfg.readIntEntry("InputFontSize",9)));
+	updateGui();
 
 	QGridLayout *layout = new QGridLayout;
 	layout->addWidget(m_pProgressBar, 0,0,2,1);
@@ -182,7 +150,7 @@ KviNotifierWindow::KviNotifierWindow()
 	layout->setContentsMargins(5,25,5,5);
 	setLayout(layout);
 
-	connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages()));
+	connect(g_pApp,SIGNAL(updateNotifier()),this,SLOT(updateGui()));
 }
 
 KviNotifierWindow::~KviNotifierWindow()
@@ -190,14 +158,20 @@ KviNotifierWindow::~KviNotifierWindow()
 	stopShowHideTimer();
 	stopBlinkTimer();
 	stopAutoHideTimer();
-	delete m_pDefaultFont;
-	delete m_pTitleFont;
 	delete m_pWndBorder;
 	delete m_pWndTabs;
 }
 
-void KviNotifierWindow::reloadImages()
+void KviNotifierWindow::updateGui()
 {
+	setFont(KVI_OPTION_FONT(KviOption_fontNotifier));
+	QPalette pal = palette();
+	pal.setColor(QPalette::Foreground, KVI_OPTION_COLOR(KviOption_colorNotifierForeground));
+	setPalette(pal);
+	QPalette palette=m_pLineEdit->palette();
+	palette.setColor(m_pLineEdit->foregroundRole(), KVI_OPTION_COLOR(KviOption_colorNotifierForeground));
+	m_pLineEdit->setPalette(palette);
+	m_pLineEdit->setFont(KVI_OPTION_FONT(KviOption_fontNotifier));
 }
 
 void KviNotifierWindow::addMessage(KviWindow * pWnd,const QString &szImageId,const QString &szText,unsigned int uMessageTime)
@@ -516,7 +490,7 @@ void KviNotifierWindow::startBlinking()
 		m_pBlinkTimer = new QTimer();
 		connect(m_pBlinkTimer,SIGNAL(timeout()),this,SLOT(blink()));
 		m_iBlinkCount = 0;
-		m_pBlinkTimer->start(m_iBlinkTimeout);
+		m_pBlinkTimer->start(1000);
 	}
 }
 
@@ -578,9 +552,16 @@ void KviNotifierWindow::paintEvent(QPaintEvent *e)
 	{
 		QPoint pnt = mapToGlobal(e->rect().topLeft());
 		p.drawTiledPixmap(e->rect(),*(g_pShadedChildGlobalDesktopBackground), pnt);
-	}
+	} else {
 #endif
+		QPixmap * pPix = KVI_OPTION_PIXMAP(KviOption_pixmapNotifierBackground).pixmap();
 
+		p.fillRect(rect(),KVI_OPTION_COLOR(KviOption_colorNotifierBackground));
+		if(pPix)
+			KviPixmapUtils::drawPixmapWithPainter(&p,pPix,KVI_OPTION_UINT(KviOption_uintNotifierPixmapAlign),rect(),width(),height());
+#ifdef COMPILE_PSEUDO_TRANSPARENCY
+	}
+#endif
 	if(m_wndRect.width()!=m_pWndBorder->width() || m_wndRect.height()!=m_pWndBorder->height())
 		m_pWndBorder->resize( m_wndRect.size() );
 
@@ -591,8 +572,9 @@ void KviNotifierWindow::paintEvent(QPaintEvent *e)
 		m_pWndBorder->draw(&p);
 	}
 
-	p.setPen(QPen(m_clrTitle));
-	p.setFont(*m_pTitleFont);
+	p.setPen(KVI_OPTION_COLOR(KviOption_colorNotifierTitleForeground));
+	p.setFont(KVI_OPTION_FONT(KviOption_fontNotifierTitle));
+
 	QString title = "KVIrc - ";
 	KviNotifierWindowTab *tab = (KviNotifierWindowTab *)m_pWndTabs->currentWidget();
 	if(tab)
diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/notifierwindow.h
index bd6104aa2..1a030d53d 100644
--- a/src/modules/notifier/notifierwindow.h
+++ b/src/modules/notifier/notifierwindow.h
@@ -37,7 +37,6 @@
 #include <QColor>
 #include <QCursor>
 #include <QDateTime>
-#include <QFont>
 #include <QImage>
 #include <QLineEdit>
 #include <QPixmap>
@@ -69,30 +68,15 @@ protected:
 	State   m_eState;
 	bool    m_bBlinkOn;
 	double  m_dOpacity;
-// 	QImage  m_imgDesktop;            // the desktop screenshot
-// 	QPixmap m_pixBackground;         // our background image
-// 	QPixmap m_pixBackgroundHighlighted;
-// 	QPixmap m_pixForeground;         // we paint the stuff HERE
-// 
-// 	// Notifier graphic layout
-// 	QPixmap m_pixBckgrnd;
 
 	bool    m_bCloseDown;
 	bool    m_bPrevDown;
 	bool    m_bNextDown;
 	bool    m_bWriteDown;
-	bool m_bCrashShowWorkAround;
-
-	QFont * m_pDefaultFont;
-	QFont * m_pTitleFont;
+	bool    m_bCrashShowWorkAround;
 
 	QRect	m_wndRect;
 
-	QColor  m_clrCurText;
-	QColor  m_clrOldText[NUM_OLD_COLORS];
-	QColor  m_clrHistoricText;
-	QColor  m_clrTitle;
-
 	KviNotifierMessage * m_pCurrentMessage;
 	QLineEdit * m_pLineEdit;
 
@@ -106,8 +90,6 @@ protected:
 	QPoint      m_pntDrag;
 	QPoint      m_pntPos;
 	QPoint      m_pntClick;
-	int         m_iInputHeight;
-	int         m_iBlinkTimeout;
 	int         m_iBlinkCount;
 	KviTalPopupMenu     * m_pContextPopup;
 	KviTalPopupMenu     * m_pDisablePopup;
@@ -116,7 +98,6 @@ protected:
 	kvi_time_t  m_tStartedAt;
 	QTime	    m_qtStartedAt;
 	bool	    m_bDisableHideOnMainWindowGotAttention;
-	//bool	    m_bForceShowing;
 
 	QCursor m_cursor;
 
@@ -126,7 +107,6 @@ protected:
 public:
 	void doShow(bool bDoAnimate);
 	void doHide(bool bDoAnimate);
-	const QFont & defaultFont(){ return *m_pDefaultFont; };
 	int textWidth();
 	void addMessage(KviWindow * pWnd,const QString &szImageId,const QString &szText,unsigned int uMessageTime);
 	void setDisableHideOnMainWindowGotAttention(bool b){ m_bDisableHideOnMainWindowGotAttention = b; };
@@ -151,7 +131,7 @@ protected slots:
 	void blink();
 	void heartbeat();
 	void returnPressed();
-	void reloadImages();
+	void updateGui();
 	void fillContextPopup();
 	void disableFor1Minute();
 	void disableFor5Minutes();
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_