A slighty slimmer layout.

3 files changed, 14 insertions, 6 deletions

diff --git a/client/widgets/frame.cc b/client/widgets/frame.cc
index 44571f5..1c0955e 100644
--- a/client/widgets/frame.cc
+++ b/client/widgets/frame.cc
@@ -45,5 +45,6 @@ Frame::Frame(QDomNode &node, MacroWindow *macrowindow)
   setLineWidth(0);
   setMidLineWidth(0);
   setContentsMargins(0,0,0,0);
+  layout()->setContentsMargins(0,0,0,0);
 }
 
diff --git a/client/widgets/multilist.cc b/client/widgets/multilist.cc
index 80addf7..b2ba2a2 100644
--- a/client/widgets/multilist.cc
+++ b/client/widgets/multilist.cc
@@ -42,7 +42,7 @@ MultiList::MultiList(QDomNode &node, MacroWindow *macrowindow)
 
   QWidget *inputbox = new QWidget(this);
   inputbox->setContentsMargins(0,0,0,0);
-  layout->addWidget(inputbox, 0, 0, Qt::AlignTop);
+  layout->addWidget(inputbox, 0, 0, 1, 2, Qt::AlignTop);
 
   QDomElement elem = node.toElement();
   if(elem.hasAttribute("layout")) {
@@ -69,16 +69,19 @@ MultiList::MultiList(QDomNode &node, MacroWindow *macrowindow)
 
   QPushButton *add = new QPushButton(this);
   connect(add, SIGNAL(clicked()), this, SLOT(add()));
-  add->setText("+");
-  layout->addWidget(add, 0, 1, Qt::AlignTop);
+  add->setText("Tilføj");
+  //  layout->addWidget(add, 0, 1, Qt::AlignTop);
+  layout->addWidget(add, 1, 0, 1, 1, Qt::AlignTop);
 
   list = new QListWidget(this);
-  layout->addWidget(list, 1, 0, Qt::AlignTop);
+  //  layout->addWidget(list, 1, 0, Qt::AlignTop);
+  layout->addWidget(list, 2, 0, 1, 2, Qt::AlignTop);
 
   QPushButton *rem = new QPushButton(this);
   connect(rem, SIGNAL(clicked()), this, SLOT(remove()));
-  rem->setText("-");
-  layout->addWidget(rem, 1, 1, Qt::AlignTop);
+  rem->setText("Fjern");
+  //  layout->addWidget(rem, 1, 1, Qt::AlignTop);
+  layout->addWidget(rem, 1, 1, 1, 1, Qt::AlignTop);
 
   /* // This is done later
   if(elem.hasAttribute("value")) {
@@ -105,6 +108,8 @@ MultiList::MultiList(QDomNode &node, MacroWindow *macrowindow)
   if(elem.hasAttribute("height")) {
     setMinimumHeight(elem.attribute("height").toInt());
   }
+
+  layout->setContentsMargins(0,0,0,0);
 }
 
 void MultiList::changed()
diff --git a/client/widgets/radiobuttons.cc b/client/widgets/radiobuttons.cc
index a690f17..0c3892c 100644
--- a/client/widgets/radiobuttons.cc
+++ b/client/widgets/radiobuttons.cc
@@ -72,6 +72,8 @@ RadioButtons::RadioButtons(QDomNode &node, MacroWindow *macrowindow)
     setValue(elem.attribute("value"));
   }
   */
+  layout()->setContentsMargins(0,0,0,0);
+
 }
 
 bool RadioButtons::isValid()