A quick fix for Big Endian machines

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

7 files changed, 41 insertions, 25 deletions

diff --git a/src/kvilib/file/kvi_file.cpp b/src/kvilib/file/kvi_file.cpp
index 6d45be342..3dbeb6f94 100644
--- a/src/kvilib/file/kvi_file.cpp
+++ b/src/kvilib/file/kvi_file.cpp
@@ -120,7 +120,7 @@ bool KviFile::load(kvi_u32_t &t)
 {
 	if(!(readBlock((char *)(&t),sizeof(kvi_u32_t)) == sizeof(kvi_u32_t)))return false;
 #ifndef LOCAL_CPU_LITTLE_ENDIAN
-	t = kvi_littleEndianToLocalCpu32(t)
+	t = kvi_littleEndianToLocalCpu32(t);
 #endif
 	return true;
 }
@@ -137,7 +137,7 @@ bool KviFile::load(kvi_u64_t &t)
 {
 	if(!(readBlock((char *)(&t),sizeof(kvi_u32_t)) == sizeof(kvi_u32_t)))return false;
 #ifndef LOCAL_CPU_LITTLE_ENDIAN
-	t = kvi_littleEndianToLocalCpu32(t)
+	t = kvi_littleEndianToLocalCpu32(t);
 #endif
 	return true;
 }
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index 86dd1c712..dc9fc7c58 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -216,8 +216,8 @@ void register_core_actions(KviActionManager * m)
 		__tr2qs("Manage Themes..."),
 		__tr2qs("Allows you to manage the themes"),
 		KviActionManager::categorySettings(),
-		"kvi_bigicon_themes.png",
-		KVI_SMALLICON_THEMES,
+		"kvi_bigicon_theme.png",
+		KVI_SMALLICON_THEME,
 		0,
 		"Ctrl+Alt+L");
 
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index a2edb1fea..610bdde74 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -341,8 +341,7 @@ static const char * g_szIconNames[KVI_NUM_SMALL_ICONS]=
 	"themeoptions", // 287
 	"bug", // 288
 	"refresh", //289
-	"theme", // 290
-	"themes" // 291
+	"theme" // 290
 };
 
 KviIconWidget::KviIconWidget()
diff --git a/src/kvirc/kernel/kvi_iconmanager.h b/src/kvirc/kernel/kvi_iconmanager.h
index 99e58e337..2c7ab1219 100644
--- a/src/kvirc/kernel/kvi_iconmanager.h
+++ b/src/kvirc/kernel/kvi_iconmanager.h
@@ -329,9 +329,8 @@
 #define KVI_SMALLICON_BUG 288
 #define KVI_SMALLICON_REFRESH 289
 #define KVI_SMALLICON_THEME 290
-#define KVI_SMALLICON_THEMES 291
 
-#define KVI_NUM_SMALL_ICONS 292
+#define KVI_NUM_SMALL_ICONS 291
 
 
 #define KVI_BIGICON_DISCONNECTED "kvi_bigicon_disconnected.png"
@@ -345,7 +344,6 @@
 #define KVI_BIGICON_KVS "kvi_bigicon_kvs.png"
 #define KVI_BIGICON_THEME "kvi_bigicon_theme.png"
 #define KVI_BIGICON_ADDONS "kvi_bigicon_addons.png"
-#define KVI_BIGICON_THEMES "kvi_bigicon_themes.png"
 
 #define KVI_BIGICON_HELPINDEX "kvi_bigicon_helpindex.png"
 #define KVI_BIGICON_HELPBACK "kvi_bigicon_helpback.png"
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 403d2bbd1..bb0c2f6cb 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -1352,6 +1352,7 @@ void KviApp::loadTheme(const QString &themeDir)
 	getLocalKvircDirectory(szPointerFile,Themes,"current-splash");
 	KviFileUtils::removeFile(szPointerFile);
 
+
 	QString szD = themeDir;
 	KviQString::ensureLastCharIs(szD,KVI_PATH_SEPARATOR_CHAR);
 	szD.append("themedata.kvc");
@@ -1361,10 +1362,8 @@ void KviApp::loadTheme(const QString &themeDir)
 	cfg.setGroup("ThemeData");
 
 	int i;
-
 	int iResetFlags = 0;
 
-
 	#undef READ_OPTIONS
 
 	#define READ_OPTIONS(_num,_table,_readFnc) \
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 566b2691c..28ce3dca9 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -807,7 +807,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
 : QDialog(parent,"theme_options_widget")
 {
 	setCaption(__tr2qs_ctx("Manage Themes - KVIrc","theme"));
-	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_THEMES)));
+	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_THEME)));
 
 	setModal(true);
 
@@ -820,17 +820,18 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
 	QHBox *hb = new QHBox(this);
 	g->addMultiCellWidget(hb,0,0,0,1);
 
-	KviStyledToolButton * tb = new KviStyledToolButton(hb);
-	tb->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN)));
-	tb->setUsesBigPixmap(true);
-	QToolTip::add(tb,__tr2qs_ctx("Install Theme Package From Disk","theme"));
-	connect(tb,SIGNAL(clicked()),this,SLOT(installFromXml()));
+	KviStyledToolButton * tb;
+	QFrame * sep;
 
 	tb = new KviStyledToolButton(hb);
 	tb->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE)));
 	tb->setUsesBigPixmap(true);
 	QToolTip::add(tb,__tr2qs_ctx("Save Current Theme...","theme"));
 	connect(tb,SIGNAL(clicked()),this,SLOT(saveCurrentTheme()));
+
+	sep = new QFrame(hb);
+	sep->setFrameStyle(QFrame::VLine | QFrame::Sunken);
+	sep->setMinimumWidth(12);
 	
 	m_pPackThemeButton = new KviStyledToolButton(hb);
 	m_pPackThemeButton->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_PACK)));
@@ -844,6 +845,16 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
 	QToolTip::add(m_pDeleteThemeButton,__tr2qs_ctx("Delete Selected Themes","theme"));
 	connect(m_pDeleteThemeButton,SIGNAL(clicked()),this,SLOT(deleteTheme()));
 
+	sep = new QFrame(hb);
+	sep->setFrameStyle(QFrame::VLine | QFrame::Sunken);
+	sep->setMinimumWidth(12);
+
+	tb = new KviStyledToolButton(hb);
+	tb->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN)));
+	tb->setUsesBigPixmap(true);
+	QToolTip::add(tb,__tr2qs_ctx("Install Theme Package From Disk","theme"));
+	connect(tb,SIGNAL(clicked()),this,SLOT(installFromXml()));
+
 	tb = new KviStyledToolButton(hb);
 	tb->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_WWW)));
 	tb->setUsesBigPixmap(true);
@@ -869,7 +880,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
 	g->addWidget(b,2,1);
 
 	g->setRowStretch(1,0);
-	g->setColStretch(0,0);
+	g->setColStretch(0,1);
 
 	fillThemeBox();
 	m_pContextPopup = new QPopupMenu(this);
@@ -1031,7 +1042,22 @@ void KviThemeManagementDialog::installFromXml()
 
 	// ok.. it should be really valid at this point
 	
-	// load it's picture
+	// load its picture
+	QByteArray * pByteArray = r.binaryInfoFields()->find("Image");
+	QPixmap pix;
+	if(pByteArray)
+	{
+		QBuffer buffer(*pByteArray);
+		buffer.open(IO_ReadOnly);
+		pix.load(&buffer);
+		buffer.close();
+	}
+	
+	if(pix.isNull())
+	{
+		// load the default icon
+	}
+	
 	/*
 	KviUnpackThemeDialog * pDialog = new KviUnpackThemeDialog(this,szFileName);
 	bool bInstall = pDialog->exec() == QDialog::Accepted;
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index d88be2ea0..36af51a05 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -35,12 +35,6 @@
 #include <qcursor.h>
 #include <qwizard.h>
 
-#define KVI_OPTIONS_WIDGET_ICON_KviThemeManagementDialog KVI_SMALLICON_GUI
-#define KVI_OPTIONS_WIDGET_NAME_KviThemeManagementDialog __tr2qs_no_lookup("Load & Save")
-#define KVI_OPTIONS_WIDGET_PRIORITY_KviThemeManagementDialog 90000
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeManagementDialog __tr2qs_no_lookup("theme")
-#define KVI_OPTIONS_WIDGET_GROUP_KviThemeManagementDialog "themeLoader"
-
 class QLineEdit;
 class QTextEdit;
 class QPushButton;