various: add collumn width, read labels

4 files changed, 20 insertions, 3 deletions

diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index d281f22e1..6efc60b7a 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -744,7 +744,12 @@ OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent)
 	labels.append(__tr2qs_ctx("Username", "options"));
 	labels.append(__tr2qs_ctx("Real Name", "options"));
 	m_pTreeWidget->setHeaderLabels(labels);
-	m_pTreeWidget->setMinimumWidth(100);
+	m_pTreeWidget->setColumnWidth(0, 110);
+	m_pTreeWidget->setColumnWidth(1, 110);
+	m_pTreeWidget->setColumnWidth(2, 110);
+	m_pTreeWidget->setColumnWidth(3, 130);
+	m_pTreeWidget->setColumnWidth(4, 120);
+	m_pTreeWidget->setColumnWidth(5, 120);
 
 	KviTalToolTip::add(m_pTreeWidget, __tr2qs_ctx("This is a set of rules to use profiles.<br>"
 	                                              "KVIrc will use them to handle the user connection "
diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp
index 4115e5fff..f2f4822ba 100644
--- a/src/modules/options/OptionsWidget_mediaTypes.cpp
+++ b/src/modules/options/OptionsWidget_mediaTypes.cpp
@@ -77,6 +77,9 @@ OptionsWidget_mediaTypes::OptionsWidget_mediaTypes(QWidget * parent)
 	columnLabels.append(__tr2qs_ctx("MIME Type", "options"));
 	columnLabels.append(__tr2qs_ctx("Description", "options"));
 	m_pTreeWidget->setHeaderLabels(columnLabels);
+	m_pTreeWidget->setColumnWidth(0, 150);
+	m_pTreeWidget->setColumnWidth(1, 180);
+	m_pTreeWidget->setColumnWidth(2, 150);
 	m_pTreeWidget->setAllColumnsShowFocus(true);
 	m_pTreeWidget->setRootIsDecorated(false);
 	connect(m_pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)));
diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp
index 6bd197cdc..539daaaa5 100644
--- a/src/modules/options/OptionsWidget_nickserv.cpp
+++ b/src/modules/options/OptionsWidget_nickserv.cpp
@@ -240,6 +240,11 @@ OptionsWidget_nickServ::OptionsWidget_nickServ(QWidget * parent)
 	columnLabels.append(__tr2qs_ctx("NickServ Request Mask", "options"));
 	columnLabels.append(__tr2qs_ctx("Identify Command", "options"));
 	m_pNickServTreeWidget->setHeaderLabels(columnLabels);
+	m_pNickServTreeWidget->setColumnWidth(0, 150);
+	m_pNickServTreeWidget->setColumnWidth(1, 150);
+	m_pNickServTreeWidget->setColumnWidth(2, 150);
+	m_pNickServTreeWidget->setColumnWidth(3, 150);
+	m_pNickServTreeWidget->setColumnWidth(4, 150);
 	connect(m_pNickServTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(enableDisableNickServControls()));
 
 	gl->addWidget(m_pNickServTreeWidget, 1, 0, 1, 3);
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 337f874cb..23360585e 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -314,6 +314,10 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par, KviIrcNetwork *
 	columnLabels.append(__tr2qs_ctx("NickServ Request Mask", "options"));
 	columnLabels.append(__tr2qs_ctx("Identify Command", "options"));
 	m_pNickServTreeWidget->setHeaderLabels(columnLabels);
+	m_pNickServTreeWidget->setColumnWidth(0, 130);
+	m_pNickServTreeWidget->setColumnWidth(1, 150);
+	m_pNickServTreeWidget->setColumnWidth(2, 190);
+	m_pNickServTreeWidget->setColumnWidth(3, 130);
 	connect(m_pNickServTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(enableDisableNickServControls()));
 	gl->addWidget(m_pNickServTreeWidget, 1, 0, 1, 3);
 
@@ -1482,8 +1486,8 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 
 	layout()->setRowStretch(1, 1);
 	layout()->setColumnStretch(1, 1);
-	setMinimumWidth(840);
-	setMinimumHeight(480);
+	setMinimumWidth(800);
+	setMinimumHeight(440);
 }
 
 OptionsWidget_servers::~OptionsWidget_servers()