Added common stuff in central file. Fixed help text reformatting.

1 files changed, 4 insertions, 13 deletions

diff --git a/client/widgets/frame.cc b/client/widgets/frame.cc
index 1c0955e..872c3fc 100644
--- a/client/widgets/frame.cc
+++ b/client/widgets/frame.cc
@@ -28,23 +28,14 @@
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 
+#include "common.h"
+
 Frame::Frame(QDomNode &node, MacroWindow *macrowindow)
   : QFrame(), Widget(node, macrowindow)
 {
-  QDomElement elem = node.toElement();
+  setCommonAttributes(this, node);
+  setCommonLayout(this, node);
 
-  if(elem.hasAttribute("layout")) {
-    if(elem.attribute("layout") == "hbox") {
-      QHBoxLayout *layout = new QHBoxLayout();
-      setLayout(layout);
-    } else if (elem.attribute("layout") == "vbox") {
-      QVBoxLayout *layout = new QVBoxLayout();
-      setLayout(layout);      
-    }
-  }
-  setLineWidth(0);
-  setMidLineWidth(0);
-  setContentsMargins(0,0,0,0);
   layout()->setContentsMargins(0,0,0,0);
 }