reduced size of theme options dialog

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

3 files changed, 43 insertions, 15 deletions

diff --git a/src/modules/options/options_vc05.vcproj b/src/modules/options/options_vc05.vcproj
index c37241b39..864974501 100644
--- a/src/modules/options/options_vc05.vcproj
+++ b/src/modules/options/options_vc05.vcproj
@@ -1368,6 +1368,13 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

 			>

 		</Filter>

+		<Filter

+			Name="Generated MOC Files"

+			Filter="moc;cpp"

+			UniqueIdentifier="{fe6e9830-be46-497d-995d-44b99b58e215}"

+			ParseFiles="false"

+			>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index f3e6ffad5..d42e1ef9a 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -103,32 +103,40 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
 		l,
 		SLOT(setEnabled(bool)));
 
-	KviTalHBox * hb = new KviTalHBox(g);
+	KviTalVBox * vb = new KviTalVBox(g);
+	vb->setSpacing(5);
 
 	connect(
 		b,
 		SIGNAL(toggled(bool)),
-		addStringSelector(hb,__tr2qs_ctx("Prefix:","options"),KviOption_stringExtendedPrivmsgPrefix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)),
+		addStringSelector(vb,__tr2qs_ctx("Prefix:","options"),KviOption_stringExtendedPrivmsgPrefix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)),
 		SLOT(setEnabled(bool)));
 	connect(
 		b,
 		SIGNAL(toggled(bool)),
-		addStringSelector(hb,__tr2qs_ctx("Postfix:","options"),KviOption_stringExtendedPrivmsgPostfix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)),
+		addStringSelector(vb,__tr2qs_ctx("Postfix:","options"),KviOption_stringExtendedPrivmsgPostfix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)),
 		SLOT(setEnabled(bool)));
+	addRowSpacer(0,3,0,3);
+}
 
+KviPrivmsgOptionsWidget::~KviPrivmsgOptionsWidget()
+{
 
+}
 
-
-	g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Timestamp","options"));
-
-	m_pUseTimestampSelector = addBoolSelector(g,__tr2qs_ctx("Show timestamp","options"),KviOption_boolIrcViewTimestamp);
+KviTimestampOptionsWidget::KviTimestampOptionsWidget(QWidget * pParent)
+: KviOptionsWidget(pParent)
+{
+	createLayout(5,1);
+	m_pUseTimestampSelector = addBoolSelector(0,0,0,0,__tr2qs_ctx("Show timestamp","options"),KviOption_boolIrcViewTimestamp);
 	
 	connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),this,SLOT(enableDisableTimestampSelector(bool)));
-	b = addBoolSelector(g,__tr2qs_ctx("Use UTC time for timestamp","options"),KviOption_boolIrcViewTimestampUTC,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp));
+	KviBoolSelector* b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Use UTC time for timestamp","options"),KviOption_boolIrcViewTimestampUTC,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp));
 	
 	connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool)));
 	
-	hb = new KviTalHBox(g);
+	KviTalHBox *hb = new KviTalHBox(this);
+	addWidgetToLayout(hb,0,2,0,2);
 	
 	m_pSpecialTimestampColorSelector = addBoolSelector(hb,__tr2qs_ctx("Use special color for timestamps","options"),KviOption_boolUseSpecialColorForTimestamp,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp));
 	connect(m_pSpecialTimestampColorSelector,SIGNAL(toggled(bool)),this,SLOT(enableDisableTimestampSelector(bool)));
@@ -136,20 +144,18 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
 	
 	m_pTimestampColorSelector = addMircTextColorSelector(hb,"",KviOption_uintTimeStampForeground,KviOption_uintTimeStampBackground,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp) && KVI_OPTION_BOOL(KviOption_boolUseSpecialColorForTimestamp));
 
-	KviStringSelector * st=addStringSelector(g,__tr2qs_ctx("Timestamp format:","options"),KviOption_stringIrcViewTimestampFormat);
+	KviStringSelector * st=addStringSelector(0,3,0,3,__tr2qs_ctx("Timestamp format:","options"),KviOption_stringIrcViewTimestampFormat);
 	connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),st,SLOT(setEnabled(bool)));
 
 	connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,SLOT(setEnabled(bool)));
-
-	
-	addRowSpacer(0,3,0,3);
+	addRowSpacer(0,4,0,4);
 }
 
-KviPrivmsgOptionsWidget::~KviPrivmsgOptionsWidget()
+KviTimestampOptionsWidget::~KviTimestampOptionsWidget()
 {
 }
 
-void KviPrivmsgOptionsWidget::enableDisableTimestampSelector(bool)
+void KviTimestampOptionsWidget::enableDisableTimestampSelector(bool)
 {
 	m_pTimestampColorSelector->setEnabled(m_pUseTimestampSelector->isChecked() && m_pSpecialTimestampColorSelector->isChecked());
 }
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/optw_messages.h
index 0219d74cd..f8d01be4e 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/optw_messages.h
@@ -61,6 +61,21 @@ class KviPrivmsgOptionsWidget : public KviOptionsWidget
 public:
 	KviPrivmsgOptionsWidget(QWidget * parent);
 	~KviPrivmsgOptionsWidget();
+};
+
+#define KVI_OPTIONS_WIDGET_ICON_KviTimestampOptionsWidget KVI_SMALLICON_TIME
+#define KVI_OPTIONS_WIDGET_NAME_KviTimestampOptionsWidget __tr2qs_no_lookup("Timestamp")
+#define KVI_OPTIONS_WIDGET_PARENT_KviTimestampOptionsWidget KviMessageOptionsWidget
+#define KVI_OPTIONS_WIDGET_PRIORITY_KviTimestampOptionsWidget 20
+#define KVI_OPTIONS_WIDGET_GROUP_KviTimestampOptionsWidget "theme"
+#define KVI_OPTIONS_WIDGET_KEYWORDS_KviTimestampOptionsWidget __tr2qs_no_lookup("time,timestamp")
+
+class KviTimestampOptionsWidget : public KviOptionsWidget
+{
+	Q_OBJECT
+public:
+	KviTimestampOptionsWidget(QWidget * parent);
+	~KviTimestampOptionsWidget();
 public:
 	KviBoolSelector * m_pUseTimestampSelector;
 	KviBoolSelector * m_pSpecialTimestampColorSelector;