From 2a7d988dc529d2276d5572f5822cee3e907518d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Wed, 12 Feb 2014 22:19:31 +0100
Subject: [PATCH] PackageInstaller: Cleanup PackageWindow

 * Also center main package installation window on screen.
---
 src/apps/packageinstaller/PackageWindow.cpp | 18 +++++++----------
 src/apps/packageinstaller/PackageWindow.h   | 22 ++++++++++-----------
 src/apps/packageinstaller/main.cpp          |  1 +
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/apps/packageinstaller/PackageWindow.cpp b/src/apps/packageinstaller/PackageWindow.cpp
index cca48365f3..04f373718a 100644
--- a/src/apps/packageinstaller/PackageWindow.cpp
+++ b/src/apps/packageinstaller/PackageWindow.cpp
@@ -11,34 +11,30 @@
 
 #include <Application.h>
 #include <Catalog.h>
-#include <GroupLayout.h>
-#include <Locale.h>
+
+#include "PackageView.h"
 
 
 #undef B_TRANSLATION_CONTEXT
 #define B_TRANSLATION_CONTEXT "PackageWindow"
 
 
-PackageWindow::PackageWindow(const entry_ref *ref)
+PackageWindow::PackageWindow(const entry_ref* ref)
 	:
 	BWindow(BRect(100, 100, 600, 300),
 		B_TRANSLATE_SYSTEM_NAME("PackageInstaller"),
 		B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
 {
-	//SetLayout(new BGroupLayout(B_HORIZONTAL));
+	PackageView* view = new PackageView(Bounds(), ref);
+	AddChild(view);
 
-	fBackground = new PackageView(Bounds(), ref);
-	AddChild(fBackground);
-
-	ResizeTo(Bounds().Width(), fBackground->Bounds().Height());
+	ResizeTo(Bounds().Width(), view->Bounds().Height());
+	CenterOnScreen();
 }
 
 
 PackageWindow::~PackageWindow()
 {
-	RemoveChild(fBackground);
-
-	delete fBackground;
 }
 
 
diff --git a/src/apps/packageinstaller/PackageWindow.h b/src/apps/packageinstaller/PackageWindow.h
index 833c37be7c..6d6a3bd12b 100644
--- a/src/apps/packageinstaller/PackageWindow.h
+++ b/src/apps/packageinstaller/PackageWindow.h
@@ -5,28 +5,26 @@
  * Author:
  *		Łukasz 'Sil2100' Zemczak <sil2100@vexillium.org>
  */
-#ifndef PACKAGEWINDOW_H
-#define PACKAGEWINDOW_H
+#ifndef PACKAGE_WINDOW_H
+#define PACKAGE_WINDOW_H
+
 
-#include "PackageView.h"
 #include <Window.h>
-#include <Entry.h>
 
 
+struct entry_ref;
+
 const uint32 P_WINDOW_QUIT		=	'PiWq';
 
 
 class PackageWindow : public BWindow {
-	public:
-		PackageWindow(const entry_ref *refs);
-		virtual ~PackageWindow();
+public:
+								PackageWindow(const entry_ref* ref);
+	virtual						~PackageWindow();
 		
-		virtual void Quit();
-		
-	private:
-		PackageView *fBackground;
+	virtual	void				Quit();
 };
 
 
-#endif
+#endif // PACKAGE_WINDOW_H
 
diff --git a/src/apps/packageinstaller/main.cpp b/src/apps/packageinstaller/main.cpp
index e228f5a2be..6fc9128ff9 100644
--- a/src/apps/packageinstaller/main.cpp
+++ b/src/apps/packageinstaller/main.cpp
@@ -17,6 +17,7 @@
 #include <FilePanel.h>
 #include <List.h>
 #include <Locale.h>
+#include <Path.h>
 #include <TextView.h>
 
 #include <stdio.h>