[haiku-commits] haiku: hrev47051 - src/kits/interface src/kits/shared headers/private/interface headers/private/shared
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 25 Mar 2014 19:17:46 +0100 (CET)
hrev47051 adds 4 changesets to branch 'master'
old head: 71e3210d35d0c0d47341d84d93a9e66ae55ab08f
new head: 9ce450b9c2f42501d4aff202b0819f96a15b66d1
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=9ce450b+%5E71e3210
----------------------------------------------------------------------------
293d80b: BAboutWindow: style fixes
* mostly whitespace fixes
* reorder methods
78877e7: AboutWindow: Add FBC padding
a60e98f: AboutWindow: Make setters virtual
9ce450b: AboutWindow: Move to Interface Kit (still private)
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 103 insertions(+), 51 deletions(-)
.../private/{shared => interface}/AboutWindow.h | 37 +++++-
src/kits/{shared => interface}/AboutWindow.cpp | 115 +++++++++++--------
src/kits/interface/Jamfile | 1 +
src/kits/shared/Jamfile | 1 -
############################################################################
Commit: 293d80be6f68667f2986d8c8d18538e2a210578e
URL: http://cgit.haiku-os.org/haiku/commit/?id=293d80b
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Tue Mar 25 17:52:21 2014 UTC
BAboutWindow: style fixes
* mostly whitespace fixes
* reorder methods
----------------------------------------------------------------------------
diff --git a/headers/private/shared/AboutWindow.h
b/headers/private/shared/AboutWindow.h
index 9a3cc60..04512f6 100644
--- a/headers/private/shared/AboutWindow.h
+++ b/headers/private/shared/AboutWindow.h
@@ -20,7 +20,7 @@ class BBitmap;
class BPoint;
class BAboutWindow : public BWindow {
- public:
+public:
BAboutWindow(const
char* appName,
const char*
signature);
virtual ~BAboutWindow();
@@ -48,8 +48,10 @@ class BAboutWindow : public BWindow {
const char* Version();
void SetVersion(const char* version);
- private:
+
+private:
AboutView* fAboutView;
};
+
#endif // B_ABOUT_WINDOW_H
diff --git a/src/kits/shared/AboutWindow.cpp b/src/kits/shared/AboutWindow.cpp
index 0b16de8..fe81925 100644
--- a/src/kits/shared/AboutWindow.cpp
+++ b/src/kits/shared/AboutWindow.cpp
@@ -42,12 +42,13 @@ static const float kStripeWidth = 30.0;
using BPrivate::gSystemCatalog;
+
#undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "AboutWindow"
class StripeView : public BView {
- public:
+public:
StripeView(BBitmap*
icon);
virtual ~StripeView();
@@ -56,13 +57,13 @@ class StripeView : public BView {
BBitmap* Icon() const { return fIcon; };
void SetIcon(BBitmap* icon);
- private:
+private:
BBitmap* fIcon;
};
class AboutView : public BGroupView {
- public:
+public:
AboutView(const char*
name,
const char*
signature);
virtual ~AboutView();
@@ -78,11 +79,11 @@ class AboutView : public BGroupView {
const char* Version();
status_t SetVersion(const char* version);
- private:
+private:
const char* _GetVersionFromSignature(const
char* signature);
BBitmap* _GetIconFromSignature(const
char* signature);
- private:
+private:
BStringView* fNameView;
BStringView* fVersionView;
BTextView* fInfoView;
@@ -90,7 +91,7 @@ class AboutView : public BGroupView {
};
-// #pragma mark -
+// #pragma mark - StripeView
StripeView::StripeView(BBitmap* icon)
@@ -304,55 +305,55 @@ AboutView::_GetIconFromSignature(const char* signature)
// #pragma mark - AboutView public methods
-const char*
-AboutView::Name()
+BBitmap*
+AboutView::Icon()
{
- return fNameView->Text();
+ if (fStripeView == NULL)
+ return NULL;
+
+ return fStripeView->Icon();
}
status_t
-AboutView::SetName(const char* name)
+AboutView::SetIcon(BBitmap* icon)
{
- fNameView->SetText(name);
+ if (fStripeView == NULL)
+ return B_NO_INIT;
+
+ fStripeView->SetIcon(icon);
return B_OK;
}
const char*
-AboutView::Version()
+AboutView::Name()
{
- return fVersionView->Text();
+ return fNameView->Text();
}
status_t
-AboutView::SetVersion(const char* version)
+AboutView::SetName(const char* name)
{
- fVersionView->SetText(version);
+ fNameView->SetText(name);
return B_OK;
}
-BBitmap*
-AboutView::Icon()
+const char*
+AboutView::Version()
{
- if (fStripeView == NULL)
- return NULL;
-
- return fStripeView->Icon();
+ return fVersionView->Text();
}
status_t
-AboutView::SetIcon(BBitmap* icon)
+AboutView::SetVersion(const char* version)
{
- if (fStripeView == NULL)
- return B_NO_INIT;
-
- fStripeView->SetIcon(icon);
+ fVersionView->SetText(version);
return B_OK;
}
@@ -362,9 +363,10 @@ AboutView::SetIcon(BBitmap* icon)
BAboutWindow::BAboutWindow(const char* appName, const char* signature)
- : BWindow(BRect(0.0, 0.0, 200.0, 200.0), appName, B_MODAL_WINDOW,
- B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_RESIZABLE
- | B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE)
+ :
+ BWindow(BRect(0.0, 0.0, 200.0, 200.0), appName, B_MODAL_WINDOW,
+ B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_RESIZABLE
+ | B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE)
{
SetLayout(new BGroupLayout(B_VERTICAL));
@@ -417,9 +419,9 @@ BAboutWindow::AboutPosition(float width, float height)
dynamic_cast<BWindow*>(BLooper::LooperForThread(find_thread(NULL)));
BScreen screen(window);
- BRect screenFrame(0, 0, 640, 480);
- if (screen.IsValid())
- screenFrame = screen.Frame();
+ BRect screenFrame(0, 0, 640, 480);
+ if (screen.IsValid())
+ screenFrame = screen.Frame();
// Horizontally, we're smack in the middle
result.x = screenFrame.left + (screenFrame.Width() / 2.0) - (width /
2.0);
@@ -577,44 +579,43 @@ BAboutWindow::AddText(const char* header, const char**
contents)
}
-const char*
-BAboutWindow::Name()
+BBitmap*
+BAboutWindow::Icon()
{
- return fAboutView->Name();
+ return fAboutView->Icon();
}
void
-BAboutWindow::SetName(const char* name)
+BAboutWindow::SetIcon(BBitmap* icon)
{
- fAboutView->SetName(name);
+ fAboutView->SetIcon(icon);
}
const char*
-BAboutWindow::Version()
+BAboutWindow::Name()
{
- return fAboutView->Version();
+ return fAboutView->Name();
}
void
-BAboutWindow::SetVersion(const char* version)
+BAboutWindow::SetName(const char* name)
{
- fAboutView->SetVersion(version);
+ fAboutView->SetName(name);
}
-BBitmap*
-BAboutWindow::Icon()
+const char*
+BAboutWindow::Version()
{
- return fAboutView->Icon();
+ return fAboutView->Version();
}
void
-BAboutWindow::SetIcon(BBitmap* icon)
+BAboutWindow::SetVersion(const char* version)
{
- fAboutView->SetIcon(icon);
+ fAboutView->SetVersion(version);
}
-
############################################################################
Commit: 78877e7200afd10e85a29c75876e1741ca25cc87
URL: http://cgit.haiku-os.org/haiku/commit/?id=78877e7
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Tue Mar 25 18:02:51 2014 UTC
AboutWindow: Add FBC padding
----------------------------------------------------------------------------
diff --git a/headers/private/shared/AboutWindow.h
b/headers/private/shared/AboutWindow.h
index 04512f6..70695ec 100644
--- a/headers/private/shared/AboutWindow.h
+++ b/headers/private/shared/AboutWindow.h
@@ -50,7 +50,32 @@ public:
void SetVersion(const char* version);
private:
+ virtual void _ReservedAboutWindow20();
+ virtual void _ReservedAboutWindow19();
+ virtual void _ReservedAboutWindow18();
+ virtual void _ReservedAboutWindow17();
+ virtual void _ReservedAboutWindow16();
+ virtual void _ReservedAboutWindow15();
+ virtual void _ReservedAboutWindow14();
+ virtual void _ReservedAboutWindow13();
+ virtual void _ReservedAboutWindow12();
+ virtual void _ReservedAboutWindow11();
+ virtual void _ReservedAboutWindow10();
+ virtual void _ReservedAboutWindow9();
+ virtual void _ReservedAboutWindow8();
+ virtual void _ReservedAboutWindow7();
+ virtual void _ReservedAboutWindow6();
+ virtual void _ReservedAboutWindow5();
+ virtual void _ReservedAboutWindow4();
+ virtual void _ReservedAboutWindow3();
+ virtual void _ReservedAboutWindow2();
+ virtual void _ReservedAboutWindow1();
+
+private:
AboutView* fAboutView;
+
+ // FBC Padding
+ uint32 _reserved[20];
};
diff --git a/src/kits/shared/AboutWindow.cpp b/src/kits/shared/AboutWindow.cpp
index fe81925..969ec7d 100644
--- a/src/kits/shared/AboutWindow.cpp
+++ b/src/kits/shared/AboutWindow.cpp
@@ -619,3 +619,27 @@ BAboutWindow::SetVersion(const char* version)
{
fAboutView->SetVersion(version);
}
+
+
+// FBC padding
+
+void BAboutWindow::_ReservedAboutWindow20() {}
+void BAboutWindow::_ReservedAboutWindow19() {}
+void BAboutWindow::_ReservedAboutWindow18() {}
+void BAboutWindow::_ReservedAboutWindow17() {}
+void BAboutWindow::_ReservedAboutWindow16() {}
+void BAboutWindow::_ReservedAboutWindow15() {}
+void BAboutWindow::_ReservedAboutWindow14() {}
+void BAboutWindow::_ReservedAboutWindow13() {}
+void BAboutWindow::_ReservedAboutWindow12() {}
+void BAboutWindow::_ReservedAboutWindow11() {}
+void BAboutWindow::_ReservedAboutWindow10() {}
+void BAboutWindow::_ReservedAboutWindow9() {}
+void BAboutWindow::_ReservedAboutWindow8() {}
+void BAboutWindow::_ReservedAboutWindow7() {}
+void BAboutWindow::_ReservedAboutWindow6() {}
+void BAboutWindow::_ReservedAboutWindow5() {}
+void BAboutWindow::_ReservedAboutWindow4() {}
+void BAboutWindow::_ReservedAboutWindow3() {}
+void BAboutWindow::_ReservedAboutWindow2() {}
+void BAboutWindow::_ReservedAboutWindow1() {}
############################################################################
Commit: a60e98f4a137f99ec0ba1bd923d9ba77a034f520
URL: http://cgit.haiku-os.org/haiku/commit/?id=a60e98f
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Tue Mar 25 18:03:18 2014 UTC
AboutWindow: Make setters virtual
----------------------------------------------------------------------------
diff --git a/headers/private/shared/AboutWindow.h
b/headers/private/shared/AboutWindow.h
index 70695ec..225483f 100644
--- a/headers/private/shared/AboutWindow.h
+++ b/headers/private/shared/AboutWindow.h
@@ -41,13 +41,13 @@ public:
const char**
contents = NULL);
BBitmap* Icon();
- void SetIcon(BBitmap* icon);
+ virtual void SetIcon(BBitmap* icon);
const char* Name();
- void SetName(const char* name);
+ virtual void SetName(const char* name);
const char* Version();
- void SetVersion(const char* version);
+ virtual void SetVersion(const char* version);
private:
virtual void _ReservedAboutWindow20();
############################################################################
Revision: hrev47051
Commit: 9ce450b9c2f42501d4aff202b0819f96a15b66d1
URL: http://cgit.haiku-os.org/haiku/commit/?id=9ce450b
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Tue Mar 25 18:17:19 2014 UTC
AboutWindow: Move to Interface Kit (still private)
----------------------------------------------------------------------------
diff --git a/headers/private/shared/AboutWindow.h
b/headers/private/interface/AboutWindow.h
similarity index 100%
rename from headers/private/shared/AboutWindow.h
rename to headers/private/interface/AboutWindow.h
diff --git a/src/kits/shared/AboutWindow.cpp
b/src/kits/interface/AboutWindow.cpp
similarity index 100%
rename from src/kits/shared/AboutWindow.cpp
rename to src/kits/interface/AboutWindow.cpp
diff --git a/src/kits/interface/Jamfile b/src/kits/interface/Jamfile
index 15eb964..0636d30 100644
--- a/src/kits/interface/Jamfile
+++ b/src/kits/interface/Jamfile
@@ -39,6 +39,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
SEARCH_SOURCE += [ FDirName $(SUBDIR) layouter ] ;
MergeObject <libbe!$(architecture)>interface_kit.o :
+ AboutWindow.cpp
AbstractLayout.cpp
AbstractLayoutItem.cpp
AffineTransform.cpp
diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile
index 66a9cea..a5d29c8 100644
--- a/src/kits/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -29,7 +29,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
StaticLibrary [ MultiArchDefaultGristFiles libshared.a ] :
AboutMenuItem.cpp
- AboutWindow.cpp
ArgumentVector.cpp
CalendarView.cpp
ColorQuantizer.cpp
Other related posts:
- » [haiku-commits] haiku: hrev47051 - src/kits/interface src/kits/shared headers/private/interface headers/private/shared - jscipione
