Added alpha component in color options

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

5 files changed, 69 insertions, 63 deletions

diff --git a/src/kvilib/ext/KviConfigurationFile.cpp b/src/kvilib/ext/KviConfigurationFile.cpp
index 394192621..84f7c0868 100644
--- a/src/kvilib/ext/KviConfigurationFile.cpp
+++ b/src/kvilib/ext/KviConfigurationFile.cpp
@@ -723,7 +723,7 @@ void KviConfigurationFile::writeEntry(const QString & szKey,const QColor &clr)
 {
 	m_bDirty = true;
 	KviConfigurationFileGroup * p_group = getCurrentGroup();
-	KviCString szData(KviCString::Format,"%d,%d,%d",clr.red(),clr.green(),clr.blue());
+	KviCString szData(KviCString::Format,"%d,%d,%d,%d",clr.red(),clr.green(),clr.blue(),clr.alpha());
 	p_group->replace(szKey,new QString(szData.ptr()));
 }
 
@@ -740,21 +740,27 @@ QColor KviConfigurationFile::readColorEntry(const QString & szKey,const QColor &
 		KviCString str(*pointer_that_IS_initialized);
 		str.stripLeftWhiteSpace();
 
-		KviCString red,green,blue;
+		KviCString red,green,blue,alpha;
 
 		str.getToken(red,',');
 		str.getToken(green,',');
 		str.getToken(blue,',');
+		str.getToken(alpha,',');
+		if(alpha.isEmpty()) alpha = "255";
 
-		if((red.isUnsignedNum())&&(green.isUnsignedNum())&&(blue.isUnsignedNum())){
+		if((red.isUnsignedNum())&&(green.isUnsignedNum())&&(blue.isUnsignedNum()) &&(alpha.isUnsignedNum())){
 			bool bOk;
 			int r = red.toInt(&bOk) % 256;
 			int g = green.toInt(&bOk) % 256;
 			int b = blue.toInt(&bOk) % 256;
+			int a = alpha.toInt(&bOk) % 256;
 			if(r < 0)r = -r;
 			if(g < 0)g = -g;
 			if(b < 0)b = -b;
+			if(a < 0)a = -a;
+
 			color.setRgb(r,g,b);
+			color.setAlpha(a);
 		}
 	}
 	return color;
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index fd0743ef6..6d1ead5c4 100644
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -467,67 +467,67 @@ KviColorOption g_mirccolorOptionsTable[KVI_NUM_MIRCCOLOR_OPTIONS]=
 	MIRC_COLOR_OPTION("15",170,170,170)
 };
 
-#define COLOR_OPTION(_name,_red,_green,_blue,_flags) \
+	#define COLOR_OPTION(_name,_red,_green,_blue,_alpha,_flags) \
 	KviColorOption(KVI_COLOR_OPTIONS_PREFIX _name, \
-		QColor(_red,_green,_blue), \
+		QColor(_red,_green,_blue,_alpha), \
 		_flags | KviOption_resetUpdateGui | KviOption_groupTheme | KviOption_resetUpdatePseudoTransparency)
 
 KviColorOption g_colorOptionsTable[KVI_NUM_COLOR_OPTIONS]=
 {
-	COLOR_OPTION("MdiBackground",0,0,0,KviOption_sectFlagMdi),
-	COLOR_OPTION("WindowListNormalText",0,0,0,KviOption_sectFlagWindowList),
-	COLOR_OPTION("WindowListMinimizedText",60,60,60,KviOption_sectFlagWindowList),
-	COLOR_OPTION("WindowListHighlight1Text",0,16,144,KviOption_sectFlagWindowList),
-	COLOR_OPTION("WindowListHighlight2Text",32,0,255,KviOption_sectFlagWindowList),
-	COLOR_OPTION("WindowListProgressBar",180,180,180,KviOption_sectFlagWindowList),
-	COLOR_OPTION("UserListViewAwayForeground",143,143,143,KviOption_sectFlagUserListView),
-	COLOR_OPTION("UserListViewOwnForeground",255,255,0,KviOption_sectFlagUserListView),
-	COLOR_OPTION("UserListViewIrcOpForeground",200,0,0,KviOption_sectFlagUserListView),
-	COLOR_OPTION("NotifierBackground",255,255,255,KviOption_sectFlagNotifier),
-	COLOR_OPTION("NotifierForeground",0,0,0,KviOption_sectFlagNotifier),
-	COLOR_OPTION("NotifierTitleForeground",255,255,255,KviOption_sectFlagNotifier),
-	COLOR_OPTION("IrcViewBackground",255,255,255,KviOption_sectFlagIrcView),
-	COLOR_OPTION("InputBackgroundColor",255,255,255,KviOption_sectFlagInput),
-	COLOR_OPTION("InputSelectionBackground",0,0,0,KviOption_sectFlagInput),
-	COLOR_OPTION("InputSelectionForeground",255,255,255,KviOption_sectFlagInput),
-	COLOR_OPTION("InputCursor",0,0,0,KviOption_sectFlagInput),
-	COLOR_OPTION("InputControl",200,100,0,KviOption_sectFlagInput),
-	COLOR_OPTION("InputForeground",0,0,0,KviOption_sectFlagInput),
-	COLOR_OPTION("UserListViewBackground",255,255,255,KviOption_sectFlagUserListView),
-	COLOR_OPTION("UserListViewOpForeground",200,0,0,KviOption_sectFlagUserListView),
-	COLOR_OPTION("UserListViewVoiceForeground",0,0,200,KviOption_sectFlagUserListView),
-	COLOR_OPTION("UserListViewNormalForeground",0,0,0,KviOption_sectFlagUserListView),
-	COLOR_OPTION("UserListViewSelectionBackground",0,0,0,KviOption_sectFlagUserListView),
-	COLOR_OPTION("UserListViewSelectionForeground",255,255,255,KviOption_sectFlagUserListView),
-	COLOR_OPTION("LabelBackground",255,255,255,KviOption_sectFlagLabel),
-	COLOR_OPTION("LabelForeground",0,0,0,KviOption_sectFlagLabel),
-	COLOR_OPTION("GlobalTransparencyFade",255,255,255,KviOption_sectFlagGui),
-	COLOR_OPTION("IrcToolBarAppletBackground",255,255,255,KviOption_sectFlagIrcToolBar),
-	COLOR_OPTION("IrcToolBarAppletForegroundLowContrast",180,180,180,KviOption_sectFlagIrcToolBar),
-	COLOR_OPTION("IrcToolBarAppletForegroundMidContrast",110,110,110,KviOption_sectFlagIrcToolBar),
-	COLOR_OPTION("IrcToolBarAppletForegroundHighContrastInactive1",40,40,40,KviOption_sectFlagIrcToolBar),
-	COLOR_OPTION("IrcToolBarAppletForegroundHighContrastInactive2",40,40,40,KviOption_sectFlagIrcToolBar),
-	COLOR_OPTION("IrcToolBarAppletForegroundHighContrastActive1",0,0,0,KviOption_sectFlagIrcToolBar),
-	COLOR_OPTION("IrcToolBarAppletForegroundHighContrastActive2",0,60,0,KviOption_sectFlagIrcToolBar),
-	COLOR_OPTION("TreeWindowListBackground",255,255,255,KviOption_sectFlagWindowList),
-	COLOR_OPTION("TreeWindowListActiveBackground",200,200,200,KviOption_sectFlagWindowList),
-	COLOR_OPTION("TreeWindowListForeground",0,0,0,KviOption_sectFlagWindowList),
-	COLOR_OPTION("TreeWindowListActiveForeground",0,0,0,KviOption_sectFlagWindowList),
-	COLOR_OPTION("TreeWindowListHighlight1Foreground",0,16,144,KviOption_sectFlagWindowList),
-	COLOR_OPTION("TreeWindowListHighlight2Foreground",32,0,255,KviOption_sectFlagWindowList),
-	COLOR_OPTION("TreeWindowListProgress",150,150,150,KviOption_sectFlagWindowList),
-	COLOR_OPTION("UserListViewHalfOpForeground",119,0,178,KviOption_sectFlagUserListView),
-	COLOR_OPTION("WindowListHighlight3Text",128,20,255,KviOption_sectFlagWindowList),
-	COLOR_OPTION("WindowListHighlight4Text",220,0,255,KviOption_sectFlagWindowList),
-	COLOR_OPTION("WindowListHighlight5Text",255,0,0,KviOption_sectFlagWindowList),
-	COLOR_OPTION("TreeWindowListHighlight3Foreground",128,0,255,KviOption_sectFlagWindowList),
-	COLOR_OPTION("TreeWindowListHighlight4Foreground",220,0,255,KviOption_sectFlagWindowList),
-	COLOR_OPTION("TreeWindowListHighlight5Foreground",255,0,0,KviOption_sectFlagWindowList),
-	COLOR_OPTION("UserListViewChanAdminForeground",83,54,5,KviOption_sectFlagUserListView),
-	COLOR_OPTION("UserListViewUserOpForeground",0,127,178,KviOption_sectFlagUserListView),
-	COLOR_OPTION("UserListViewGrid",110,110,110,KviOption_sectFlagUserListView),
-	COLOR_OPTION("UserListViewChanOwnerForeground",81,87,111,KviOption_sectFlagUserListView),
-	COLOR_OPTION("IrcViewMarkLine",40,40,40,KviOption_sectFlagIrcView)
+	COLOR_OPTION("MdiBackground",0,0,0,255,KviOption_sectFlagMdi),
+	COLOR_OPTION("WindowListNormalText",0,0,0,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("WindowListMinimizedText",60,60,60,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("WindowListHighlight1Text",0,16,144,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("WindowListHighlight2Text",32,0,255,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("WindowListProgressBar",180,180,180,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("UserListViewAwayForeground",143,143,143,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("UserListViewOwnForeground",255,255,0,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("UserListViewIrcOpForeground",200,0,0,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("NotifierBackground",255,255,255,255,KviOption_sectFlagNotifier),
+	COLOR_OPTION("NotifierForeground",0,0,0,255,KviOption_sectFlagNotifier),
+	COLOR_OPTION("NotifierTitleForeground",255,255,255,255,KviOption_sectFlagNotifier),
+	COLOR_OPTION("IrcViewBackground",255,255,255,255,KviOption_sectFlagIrcView),
+	COLOR_OPTION("InputBackgroundColor",255,255,255,255,KviOption_sectFlagInput),
+	COLOR_OPTION("InputSelectionBackground",0,0,0,255,KviOption_sectFlagInput),
+	COLOR_OPTION("InputSelectionForeground",255,255,255,255,KviOption_sectFlagInput),
+	COLOR_OPTION("InputCursor",0,0,0,255,KviOption_sectFlagInput),
+	COLOR_OPTION("InputControl",200,100,0,255,KviOption_sectFlagInput),
+	COLOR_OPTION("InputForeground",0,0,0,255,KviOption_sectFlagInput),
+	COLOR_OPTION("UserListViewBackground",255,255,255,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("UserListViewOpForeground",200,0,0,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("UserListViewVoiceForeground",0,0,200,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("UserListViewNormalForeground",0,0,0,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("UserListViewSelectionBackground",0,0,0,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("UserListViewSelectionForeground",255,255,255,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("LabelBackground",255,255,255,255,KviOption_sectFlagLabel),
+	COLOR_OPTION("LabelForeground",0,0,0,255,KviOption_sectFlagLabel),
+	COLOR_OPTION("GlobalTransparencyFade",255,255,255,255,KviOption_sectFlagGui),
+	COLOR_OPTION("IrcToolBarAppletBackground",255,255,255,255,KviOption_sectFlagIrcToolBar),
+	COLOR_OPTION("IrcToolBarAppletForegroundLowContrast",180,180,180,255,KviOption_sectFlagIrcToolBar),
+	COLOR_OPTION("IrcToolBarAppletForegroundMidContrast",110,110,110,255,KviOption_sectFlagIrcToolBar),
+	COLOR_OPTION("IrcToolBarAppletForegroundHighContrastInactive1",40,40,40,255,KviOption_sectFlagIrcToolBar),
+	COLOR_OPTION("IrcToolBarAppletForegroundHighContrastInactive2",40,40,40,255,KviOption_sectFlagIrcToolBar),
+	COLOR_OPTION("IrcToolBarAppletForegroundHighContrastActive1",0,0,0,255,KviOption_sectFlagIrcToolBar),
+	COLOR_OPTION("IrcToolBarAppletForegroundHighContrastActive2",0,60,0,255,KviOption_sectFlagIrcToolBar),
+	COLOR_OPTION("TreeWindowListBackground",255,255,255,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("TreeWindowListActiveBackground",200,200,200,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("TreeWindowListForeground",0,0,0,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("TreeWindowListActiveForeground",0,0,0,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("TreeWindowListHighlight1Foreground",0,16,144,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("TreeWindowListHighlight2Foreground",32,0,255,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("TreeWindowListProgress",150,150,150,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("UserListViewHalfOpForeground",119,0,178,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("WindowListHighlight3Text",128,20,255,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("WindowListHighlight4Text",220,0,255,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("WindowListHighlight5Text",255,0,0,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("TreeWindowListHighlight3Foreground",128,0,255,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("TreeWindowListHighlight4Foreground",220,0,255,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("TreeWindowListHighlight5Foreground",255,0,0,255,KviOption_sectFlagWindowList),
+	COLOR_OPTION("UserListViewChanAdminForeground",83,54,5,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("UserListViewUserOpForeground",0,127,178,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("UserListViewGrid",110,110,110,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("UserListViewChanOwnerForeground",81,87,111,255,KviOption_sectFlagUserListView),
+	COLOR_OPTION("IrcViewMarkLine",40,40,40,255,KviOption_sectFlagIrcView)
 };
 
 
@@ -985,6 +985,7 @@ void KviApplication::saveOptions()
 				KviStringConversion::decodePath(g_stringOptionsTable[i].option);
 		}
 	WRITE_OPTIONS(KVI_NUM_COLOR_OPTIONS,g_colorOptionsTable)
+
 	WRITE_OPTIONS(KVI_NUM_PIXMAP_OPTIONS,g_pixmapOptionsTable)
 	WRITE_OPTIONS(KVI_NUM_UINT_OPTIONS,g_uintOptionsTable)
 	WRITE_OPTIONS(KVI_NUM_FONT_OPTIONS,g_fontOptionsTable)
diff --git a/src/kvirc/ui/KviIrcToolBar.cpp b/src/kvirc/ui/KviIrcToolBar.cpp
index e67c26862..99dc45ca1 100644
--- a/src/kvirc/ui/KviIrcToolBar.cpp
+++ b/src/kvirc/ui/KviIrcToolBar.cpp
@@ -421,7 +421,7 @@ void KviIrcContextDisplay::drawContents(QPainter * p)
 
 		p->setClipping(false);
 
-		QColor base = palette().background().color();
+		QColor base = palette().window().color();
 		QColor cntx = KVI_OPTION_ICCOLOR(c->context()->id() % KVI_NUM_ICCOLOR_OPTIONS);
 		base.setRgb((base.red() + cntx.red()) >> 1,(base.green() + cntx.green()) >> 1,
 			(base.blue() + cntx.blue()) >> 1);
diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp
index 7a8b6e327..5b628da28 100644
--- a/src/kvirc/ui/KviSelectors.cpp
+++ b/src/kvirc/ui/KviSelectors.cpp
@@ -604,7 +604,7 @@ KviColorSelector::KviColorSelector(QWidget * par,const QString & txt,QColor * pO
 
 void KviColorSelector::setButtonPalette(QColor * pOption)
 {
-	QPalette pal(*pOption,palette().background().color());
+	QPalette pal(*pOption,palette().window().color());
 	m_memColor = *pOption;
 	m_pButton->setPalette(pal);
 
@@ -620,7 +620,7 @@ void KviColorSelector::forceColor(QColor clr)
 
 void KviColorSelector::changeClicked()
 {
-	QColor tmp = QColorDialog::getColor(m_memColor);
+	QColor tmp = QColorDialog::getColor(m_memColor,0,__tr2qs("Choose Color"),QColorDialog::ShowAlphaChannel);
 	if(tmp.isValid())setButtonPalette(&tmp);
 }
 
diff --git a/src/kvirc/ui/KviWebPackageManagementDialog.cpp b/src/kvirc/ui/KviWebPackageManagementDialog.cpp
index 2c44f0f8b..9b896d33d 100644
--- a/src/kvirc/ui/KviWebPackageManagementDialog.cpp
+++ b/src/kvirc/ui/KviWebPackageManagementDialog.cpp
@@ -140,7 +140,6 @@ void KviWebPackageManagementDialog::slotLoadFinished(bool bOk)
 	// search for all item_entry div
 	QWebElementCollection elementscollection=pFrame->documentElement().findAll("div.item_entry");
 
-
 	// if this is null something is wrong
 	if(elementscollection.count())
 	{