dropped styledcontrols use

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

6 files changed, 33 insertions, 30 deletions

diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
index 93b953c7c..0cf094552 100644
--- a/src/kvirc/CMakeLists.txt
+++ b/src/kvirc/CMakeLists.txt
@@ -53,7 +53,6 @@ SET(kvirc_MOC_HDRS
 	ui/kvi_splash.h
 	ui/kvi_statusbar.h
 	ui/kvi_statusbarapplet.h
-	ui/kvi_styled_controls.h
 	ui/kvi_taskbar.h
 	ui/kvi_texticonwin.h
 	ui/kvi_themedlabel.h
@@ -251,7 +250,6 @@ SET(kvirc_SRCS
 	ui/kvi_splash.cpp
 	ui/kvi_statusbar.cpp
 	ui/kvi_statusbarapplet.cpp
-	ui/kvi_styled_controls.cpp
 	ui/kvi_taskbar.cpp
 	ui/kvi_texticonwin.cpp
 	ui/kvi_themedlabel.cpp
@@ -438,15 +436,15 @@ ELSE()
 	SET(KVIRC_BINARYNAME ${PACKAGE})
 	SET(KVILIB_BINARYNAME kvilib)
 ENDIF()
-

-IF(MINGW)

-        # resource compilation for mingw

-        ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/win32_resource.o

-          COMMAND windres.exe -I${CMAKE_SOURCE_DIR}/data/resources_win32/ -i${CMAKE_SOURCE_DIR}/data/resources_win32/kvirc.rc -o${CMAKE_CURRENT_BINARY_DIR}/win32_resource.o

-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data/resources_win32

-        )

-        LIST(APPEND kvirc_SRCS ${CMAKE_CURRENT_BINARY_DIR}/win32_resource.o)

-ENDIF()

+
+IF(MINGW)
+        # resource compilation for mingw
+        ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/win32_resource.o
+          COMMAND windres.exe -I${CMAKE_SOURCE_DIR}/data/resources_win32/ -i${CMAKE_SOURCE_DIR}/data/resources_win32/kvirc.rc -o${CMAKE_CURRENT_BINARY_DIR}/win32_resource.o
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data/resources_win32
+        )
+        LIST(APPEND kvirc_SRCS ${CMAKE_CURRENT_BINARY_DIR}/win32_resource.o)
+ENDIF()
 
 ADD_EXECUTABLE(${KVIRC_BINARYNAME} ${kvirc_SRCS} ${kvirc_MOC_SRCS})
 
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 9ad4024d2..ae9a5b2a8 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -215,11 +215,12 @@ void KviApp::setup()
 #endif
 
 	// Setup our filesystem and initalize locale
-	g_pIconManager = new KviIconManager();
 	
 	loadDirectories();
 	KviStringConversion::init(m_szGlobalKvircDir,m_szLocalKvircDir);
 
+	g_pIconManager = new KviIconManager();
+
 #ifdef COMPILE_ON_WINDOWS
 	//need to load image plugins:(
 	QString szPluginsDir;
diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp
index 28b6b9652..162244f1c 100644
--- a/src/kvirc/ui/kvi_styled_controls.cpp
+++ b/src/kvirc/ui/kvi_styled_controls.cpp
@@ -24,7 +24,7 @@
 
 
 #define __KVIRC__
-
+/*
 #include "kvi_styled_controls.h"
 #include "kvi_iconmanager.h"
 #include "kvi_app.h"
@@ -346,7 +346,7 @@ void KviStyledToolButton::resizeEvent ( QResizeEvent * e)
 		setMinimumWidth(bShowSubmenuIndicator ? pix.width()+8+pStoredPix->width() : pix.width());
 	}
 }
-
+*/
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "kvi_styled_controls.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/kvirc/ui/kvi_styled_controls.h b/src/kvirc/ui/kvi_styled_controls.h
index a8af9d5ce..36deadf53 100644
--- a/src/kvirc/ui/kvi_styled_controls.h
+++ b/src/kvirc/ui/kvi_styled_controls.h
@@ -24,15 +24,19 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 ///////////////////////////////////////////////////////////////////////////////
-
+/*
 #include "kvi_settings.h"
 #include "kvi_heapobject.h"
-
-#include <QCheckBox>
 #include <QEvent>
 #include <QTimer>
+*/
+#include <QCheckBox>
 #include <QToolButton>
 
+#define KviStyledCheckBox QCheckBox
+#define KviStyledToolButton QToolButton
+
+/*
 class KviStyledControl;
 class KviTalToolBar;
 
@@ -100,5 +104,5 @@ protected:
 	virtual void paintEvent ( QPaintEvent * );
 	virtual void resizeEvent ( QResizeEvent * );
 };
-
+*/
 #endif
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index a57f1fe01..c7e708006 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -103,22 +103,22 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
 	hb->setSpacing(1);

 	g->addWidget(hb,0,0);

 

-	KviStyledToolButton * tb;

+	QToolButton * tb;

 	QFrame * sep;

 

-	m_pConfigureButton = new KviStyledToolButton(hb);

+	m_pConfigureButton = new QToolButton(hb);

 	m_pConfigureButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_ADDONS)));

 	m_pConfigureButton->setIconSize(QSize(32,32));

 	KviTalToolTip::add(m_pConfigureButton,__tr2qs_ctx("Configure Addon...","addon"));

 	connect(m_pConfigureButton,SIGNAL(clicked()),this,SLOT(configureScript()));

 

-	m_pHelpButton = new KviStyledToolButton(hb);

+	m_pHelpButton = new QToolButton(hb);

 	m_pHelpButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_HELP)));

 	m_pHelpButton->setIconSize(QSize(32,32));

 	KviTalToolTip::add(m_pHelpButton,__tr2qs_ctx("Show Help","addon"));

 	connect(m_pHelpButton,SIGNAL(clicked()),this,SLOT(showScriptHelp()));

 

-	m_pUninstallButton = new KviStyledToolButton(hb);

+	m_pUninstallButton = new QToolButton(hb);

 	m_pUninstallButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_REMOVE)));

 	m_pUninstallButton->setIconSize(QSize(32,32));

 	KviTalToolTip::add(m_pUninstallButton,__tr2qs_ctx("Delete Selected Addons","addon"));

@@ -128,7 +128,7 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
 	sep->setFrameStyle(QFrame::VLine | QFrame::Sunken);

 	sep->setMinimumWidth(12);

 	

-	m_pPackButton = new KviStyledToolButton(hb);

+	m_pPackButton = new QToolButton(hb);

 	m_pPackButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_PACK)));

 	m_pPackButton->setIconSize(QSize(32,32));

 	KviTalToolTip::add(m_pPackButton,__tr2qs_ctx("Create an Addon as a Distributable Package","addon"));

@@ -138,13 +138,13 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
 	sep->setFrameStyle(QFrame::VLine | QFrame::Sunken);

 	sep->setMinimumWidth(12);

 

-	tb = new KviStyledToolButton(hb);

+	tb = new QToolButton(hb);

 	tb->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN)));

 	tb->setIconSize(QSize(32,32));

 	KviTalToolTip::add(tb,__tr2qs_ctx("Install Addon Package From Disk","addon"));

 	connect(tb,SIGNAL(clicked()),this,SLOT(installScript()));

 

-	tb = new KviStyledToolButton(hb);

+	tb = new QToolButton(hb);

 	tb->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_WWW)));

 	tb->setIconSize(QSize(32,32));

 	KviTalToolTip::add(tb,__tr2qs_ctx("Get More Addons...","addon"));

diff --git a/src/modules/addon/managementdialog.h b/src/modules/addon/managementdialog.h
index 53511abb8..2da43bcc7 100644
--- a/src/modules/addon/managementdialog.h
+++ b/src/modules/addon/managementdialog.h
@@ -34,8 +34,8 @@
 #include <QTextDocument>
 #include <QListWidget>
 #include <QItemDelegate>
+#include <QToolButton>
 
-class KviStyledToolButton;
 class QPixmap;
 class KviKvsScriptAddon;
 
@@ -68,10 +68,10 @@ public:
 protected:
 	KviTalListWidget * m_pListWidget;
 	static KviScriptManagementDialog * m_pInstance;
-	KviStyledToolButton * m_pConfigureButton;
-	KviStyledToolButton * m_pHelpButton;
-	KviStyledToolButton * m_pPackButton;
-	KviStyledToolButton * m_pUninstallButton;
+	QToolButton * m_pConfigureButton;
+	QToolButton * m_pHelpButton;
+	QToolButton * m_pPackButton;
+	QToolButton * m_pUninstallButton;
 public:
 	static KviScriptManagementDialog * instance(){ return m_pInstance; };
 	static void display();