Implemented new shortcut key system. Fade in/out shortcut tooltips. Close pcpviewer on window close due to commit/nocommit/discard actions.

1 files changed, 8 insertions, 8 deletions

diff --git a/client/widgets/window.cc b/client/widgets/window.cc
index 7aa6374..6f879a8 100644
--- a/client/widgets/window.cc
+++ b/client/widgets/window.cc
@@ -33,29 +33,29 @@
 Window::Window(QDomNode &node, MacroWindow *macrowindow)
   : Widget(node, macrowindow)
 {
-  widget = new QWidget(NULL);
+  setWidget(new QWidget(NULL));
 
-  widget->setWindowFlags(Qt::WindowContextHelpButtonHint |
+  getWidget()->setWindowFlags(Qt::WindowContextHelpButtonHint |
                          Qt::WindowSystemMenuHint);
 
-  widget->setWindowIcon(QIcon(":/icons/icon.png"));
+  getWidget()->setWindowIcon(QIcon(":/icons/icon.png"));
 
-  setCommonAttributes(widget, node);
-  setCommonLayout(widget, node);
+  setCommonAttributes(getWidget(), node);
+  setCommonLayout(getWidget(), node);
 
   QDomElement elem = node.toElement();
 
   if(elem.hasAttribute("fixed")) {
     if(elem.attribute("fixed") == "true") {
-      widget->setFixedSize(widget->width(), widget->height());
+      getWidget()->setFixedSize(getWidget()->width(), getWidget()->height());
     }
   }
 
   if(elem.hasAttribute("caption")) {
-    widget->setWindowTitle(elem.attribute("caption"));
+    getWidget()->setWindowTitle(elem.attribute("caption"));
   }
 
-  addChildren(node, widget->layout());
+  addChildren(node, getWidget()->layout());
 }
 
 Window::~Window()