quick fixes

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

4 files changed, 30 insertions, 19 deletions

diff --git a/data/mimelnk/CMakeLists.txt b/data/mimelnk/CMakeLists.txt
index c8698e1b7..5316dd657 100644
--- a/data/mimelnk/CMakeLists.txt
+++ b/data/mimelnk/CMakeLists.txt
@@ -1,6 +1,6 @@
 # CMakeLists for data/mimelnk
 IF(UNIX AND NOT APPLE)
-	INSTALL(FILES kvirc4.desktop DESTINATION ${INSTALL_PREFIX}/share/mimelnk/applications/)
+	#INSTALL(FILES kvirc4.desktop DESTINATION ${INSTALL_PREFIX}/share/mimelnk/applications/)
 	INSTALL(FILES x-kva.desktop DESTINATION ${INSTALL_PREFIX}/share/mimelnk/applications/)
 	INSTALL(FILES x-kvt.desktop DESTINATION ${INSTALL_PREFIX}/share/mimelnk/applications/)
 	INSTALL(FILES x-kvc.desktop DESTINATION ${INSTALL_PREFIX}/share/mimelnk/text/)
diff --git a/src/kvilib/tal/kvi_tal_tabdialog.cpp b/src/kvilib/tal/kvi_tal_tabdialog.cpp
index 6bbd306b3..507016fee 100644
--- a/src/kvilib/tal/kvi_tal_tabdialog.cpp
+++ b/src/kvilib/tal/kvi_tal_tabdialog.cpp
@@ -58,14 +58,14 @@ void KviTalTabDialog::setOkButton(const QString & text)
 {
 	QPushButton * pBtnOk = new QPushButton(text,this);
 	m_pLayout->addWidget(pBtnOk,1,1);
-	connect(pBtnOk,SIGNAL(pressed()),this,SLOT(okPressed()));
+	connect(pBtnOk,SIGNAL(clicked()),this,SLOT(okPressed()));
 }
 
 void KviTalTabDialog::setCancelButton(const QString & text)
 {
 	QPushButton * pBtnCancel = new QPushButton(text,this);
 	m_pLayout->addWidget(pBtnCancel,1,2);
-	connect(pBtnCancel,SIGNAL(pressed()),this,SLOT(cancelPressed()));
+	connect(pBtnCancel,SIGNAL(clicked()),this,SLOT(cancelPressed()));
 }
 
 void KviTalTabDialog::okPressed()
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index ad094d80d..683c387a0 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -24,6 +24,7 @@
 

 #include "managementdialog.h"

 

+#include "kvi_app.h"

 #include "kvi_listview.h"

 #include "kvi_locale.h"

 #include "kvi_frame.h"

@@ -82,8 +83,8 @@ void KviScriptAddonDelegate::paint( QPainter * painter, const QStyleOptionViewIt
 	}

 	QString text=index.data(Qt::DisplayRole).toString();

 	QPixmap pixmap;

-    QRect decorationRect;

-    QVariant value = index.data(Qt::DecorationRole);

+	QRect decorationRect;

+	QVariant value = index.data(Qt::DecorationRole);

 	QStyle::State state=option.state;

 	QRect rect=option.rect;

 	int afterIcon = LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING;

@@ -131,15 +132,17 @@ KviScriptAddonListViewItem::~KviScriptAddonListViewItem()
 	

 	delete m_pAddon;

 }

+

 /*

 QString KviScriptAddonListViewItem::key(int,bool) const

 {

 	return m_szKey;

 }

 */

+

 void KviScriptAddonListViewItem::setup()

 {

-/*

+	/*

 	KviTalListViewItem::setup();

 	int iWidth = m_pListView->visibleWidth();

 	if(iWidth < LVI_MINIMUM_CELL_WIDTH)iWidth = LVI_MINIMUM_CELL_WIDTH;

@@ -147,8 +150,8 @@ void KviScriptAddonListViewItem::setup()
 	int iHeight = m_pText->size().height() + (2 * LVI_BORDER);

 	if(iHeight < (LVI_ICON_SIZE + (2 * LVI_BORDER)))iHeight = LVI_ICON_SIZE + (2 * LVI_BORDER);

 	setHeight(iHeight+2);

-*/

-	}

+	*/

+}

 

 void KviScriptAddonListViewItem::paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align)

 {

@@ -167,7 +170,6 @@ void KviScriptAddonListViewItem::paintCell(QPainter * p,const QColorGroup & cg,i
 	m_pText->setPageSize(QSizeF(www,height() - (LVI_BORDER * 2)));

 	m_pText->drawContents(p);

 	*/

-	

 }

 

 KviScriptAddonListView::KviScriptAddonListView(QWidget * pParent)

@@ -181,7 +183,7 @@ KviScriptAddonListView::KviScriptAddonListView(QWidget * pParent)
 	if(iWidth < LVI_MINIMUM_CELL_WIDTH)iWidth = LVI_MINIMUM_CELL_WIDTH;

 	

 	// FIXME: doesn't work in Qt4

-/*

+	/*

 	int iWidth = visibleWidth();

 	if(iWidth < LVI_MINIMUM_CELL_WIDTH)iWidth = LVI_MINIMUM_CELL_WIDTH;

 	addColumn("",iWidth);

@@ -228,6 +230,13 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
 	*/

 	m_pListView = new KviScriptAddonListView(this);

 	m_pListView->setItemDelegate(new KviScriptAddonDelegate(m_pListView));

+

+	QString szPic;

+	g_pApp->getGlobalKvircDirectory(szPic,KviApp::Pics);

+	szPic += "/kvi_dialog_addons.png";

+	QString style("QListWidget {image: url(" + szPic + ");  background-attachment: fixed;}");

+	debug("style: %s",style.toUtf8().data());

+	m_pListView->setStyleSheet(style);

 	g->addMultiCellWidget(m_pListView,0,10,1,1);

 

 	m_pConfigureButton = new QPushButton(__tr2qs("Configure"),this);

diff --git a/src/modules/addon/managementdialog.h b/src/modules/addon/managementdialog.h
index 5b12c3818..a0db5a934 100644
--- a/src/modules/addon/managementdialog.h
+++ b/src/modules/addon/managementdialog.h
@@ -35,6 +35,7 @@
 #include <QTextDocument>
 #include <QListWidget>
 #include <QItemDelegate>
+
 class QPushButton;
 class QPixmap;
 class KviKvsScriptAddon;
@@ -101,14 +102,15 @@ protected slots:
 	void getMoreScripts();
 	void installScript();
 };
-class KviScriptAddonDelegate : public QItemDelegate

-{

-public:

-	KviScriptAddonDelegate(QListWidget * pWidget)

-		: QItemDelegate(pWidget){};

-	~KviScriptAddonDelegate(){};

-	 QSize sizeHint(const QStyleOptionViewItem &option,const QModelIndex &index) const;

-	 void paint ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;

-	};
+
+class KviScriptAddonDelegate : public QItemDelegate
+{
+public:
+	KviScriptAddonDelegate(QListWidget * pWidget)
+		: QItemDelegate(pWidget){};
+	~KviScriptAddonDelegate(){};
+	 QSize sizeHint(const QStyleOptionViewItem &option,const QModelIndex &index) const;
+	 void paint ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
+};
 
 #endif //!_MANAGEMENTDIALOG_H_