some fixes to options windows positioning and size;

global fix for hbox/vbox margin and spacing widths

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

7 files changed, 45 insertions, 10 deletions

diff --git a/src/kvilib/tal/kvi_tal_hbox.cpp b/src/kvilib/tal/kvi_tal_hbox.cpp
index 7f7deccfc..6f9396c3b 100644
--- a/src/kvilib/tal/kvi_tal_hbox.cpp
+++ b/src/kvilib/tal/kvi_tal_hbox.cpp
@@ -58,6 +58,9 @@ KviTalHBox::KviTalHBox(QWidget * pParent, char * name)
 	setObjectName(name);
 
 	m_pLayout = new QHBoxLayout(this);
+	m_pLayout->setMargin(3);
+	m_pLayout->setSpacing(2);
+
 	setLayout(m_pLayout);
 }
 
diff --git a/src/kvilib/tal/kvi_tal_vbox.cpp b/src/kvilib/tal/kvi_tal_vbox.cpp
index 1bde2a224..0aa4da5ec 100644
--- a/src/kvilib/tal/kvi_tal_vbox.cpp
+++ b/src/kvilib/tal/kvi_tal_vbox.cpp
@@ -33,6 +33,9 @@ KviTalVBox::KviTalVBox(QWidget * pParent,char* name)
 	setObjectName(name);
 
 	m_pLayout = new QVBoxLayout(this);
+	m_pLayout->setMargin(3);
+	m_pLayout->setSpacing(2);
+
 	setLayout(m_pLayout);
 }
 
diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp
index fe9b43413..162bef653 100644
--- a/src/kvirc/ui/kvi_optionswidget.cpp
+++ b/src/kvirc/ui/kvi_optionswidget.cpp
@@ -89,6 +89,8 @@ void KviOptionsWidget::createLayout()
 {
 	if(m_pLayout)delete m_pLayout;
 	m_pLayout = new QGridLayout(this);//,rows,cols,KVI_OPTIONSWIDGET_GRIDLAYOUT_BORDER,KVI_OPTIONSWIDGET_GRIDLAYOUT_SPACE);
+	m_pLayout->setMargin(0);
+	m_pLayout->setSpacing(0);
 }
 
 void KviOptionsWidget::createTabbedPage()
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index 0347e530a..23de049a6 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -48,7 +48,7 @@
 #include <QPushButton>
 #include <QLayout>
 #include <QApplication>
-
+#include <QDesktopWidget>
 #include <QLineEdit>
 #include <QLabel>
 #include <QFrame>
@@ -316,10 +316,10 @@ void KviScriptManagementDialog::installScript()
 
 void KviScriptManagementDialog::showEvent(QShowEvent * e)
 {
-//	QRect r = parentWidget() ? parentWidget()->rect() : g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
-//	int x = (r.width() - width()) / 2;
-//	int y = (r.height() - height()) / 2;
-//	move(x,y);
+	QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
+	move((rect.width() - width())/2,(rect.height() - height())/2);
+
+	QDialog::showEvent(e);
 }
 
 void KviScriptManagementDialog::closeClicked()
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 308ffe1a2..d1ae6cf16 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -48,6 +48,7 @@
 #include <QCloseEvent>
 #include <QShortcut>
 #include <QHeaderView>
+#include <QDesktopWidget>
 
 //FIXME: some headers must be hidden
 
@@ -280,6 +281,30 @@ KviOptionsDialog::~KviOptionsDialog()
 		g_pOptionsDialogDict->remove(m_szGroup);
 }
 
+void KviOptionsDialog::showEvent(QShowEvent *e)
+{
+	QRect r = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
+		
+	int w = r.width();
+	int h = r.height();
+
+	int ww = width();
+	int wh = height();
+
+	if(w < 800)
+	{
+		// 640x480
+		if(ww < 630)ww = 630;
+	} else {
+		if(ww < 770)ww = 770;
+	}
+	
+	setGeometry((w - ww) / 2,(h - wh) / 2,ww,wh);
+
+	move((r.width() - width())/2,(r.height() - height())/2);
+
+	QDialog::showEvent(e);
+}
 
 void KviOptionsDialog::searchLineEditTextChanged(const QString &)
 {
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index 7b5cef93f..7ec6fe666 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -91,6 +91,7 @@ protected:
 	void apply(bool bDialogAboutToClose);
 	virtual void closeEvent(QCloseEvent *e);
 	virtual void keyPressEvent( QKeyEvent * e );
+	virtual void showEvent(QShowEvent *e);
 	bool recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QStringList &lKeywords);
 public:
 	void search(const QString &szKeywords);
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index 02d6a8b8e..3a9419f12 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -24,6 +24,7 @@
 
 #include "toolbareditor.h"
 
+#include "kvi_app.h"
 #include "kvi_actiondrawer.h"
 #include "kvi_locale.h"
 #include "kvi_frame.h"
@@ -49,6 +50,7 @@
 #include <QTimer>
 #include <QEvent>
 #include <QDropEvent>
+#include <QDesktopWidget>
 
 KviCustomizeToolBarsDialog * KviCustomizeToolBarsDialog::m_pInstance = 0;
 extern QRect g_rectToolBarEditorDialogGeometry;
@@ -367,11 +369,10 @@ void KviCustomizeToolBarsDialog::currentToolBarChanged()
 
 void KviCustomizeToolBarsDialog::showEvent(QShowEvent * e)
 {
-//	repaintContents();
-//	QRect r = parentWidget() ? parentWidget()->rect() : QApplication::desktop() SCREEEN ->rect();
-//	int x = (r.width() - width()) / 2;
-//	int y = (r.height() - height()) / 2;
-//	move(x,y);
+	QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
+	move((rect.width() - width())/2,(rect.height() - height())/2);
+
+	QDialog::showEvent(e);
 }
 
 void KviCustomizeToolBarsDialog::deleteToolBar()