[haiku-commits] haiku: hrev45157 - src/apps/deskbar
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 14 Jan 2013 21:17:03 +0100 (CET)
hrev45157 adds 2 changesets to branch 'master'
old head: dc871e324d59c1cd691fdedca8807d11e5b959d0
new head: c5d129a27ae16c605e089a23158207d1f8532f00
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=c5d129a+%5Edc871e3
----------------------------------------------------------------------------
74a0eef: Cleanup, no functional change
c5d129a: Style changes only
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 64 insertions(+), 66 deletions(-)
src/apps/deskbar/BarApp.h | 113 +++++++++++++++--------------
src/apps/deskbar/PreferencesWindow.cpp | 3 +-
src/apps/deskbar/PreferencesWindow.h | 14 ++--
############################################################################
Commit: 74a0eef547ea4d5335229dfc2fbda50a9e4d43d3
URL: http://cgit.haiku-os.org/haiku/commit/?id=74a0eef
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Mon Jan 14 20:16:06 2013 UTC
Cleanup, no functional change
----------------------------------------------------------------------------
diff --git a/src/apps/deskbar/PreferencesWindow.cpp
b/src/apps/deskbar/PreferencesWindow.cpp
index ac00768..5312603 100644
--- a/src/apps/deskbar/PreferencesWindow.cpp
+++ b/src/apps/deskbar/PreferencesWindow.cpp
@@ -231,8 +231,7 @@ PreferencesWindow::PreferencesWindow(BRect frame)
BLayoutBuilder::Group<>(this)
.Add(tabView)
- .SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
- B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
+ .SetInsets(B_USE_DEFAULT_SPACING)
.End();
CenterOnScreen();
diff --git a/src/apps/deskbar/PreferencesWindow.h
b/src/apps/deskbar/PreferencesWindow.h
index 026bc73..3f0540d 100644
--- a/src/apps/deskbar/PreferencesWindow.h
+++ b/src/apps/deskbar/PreferencesWindow.h
@@ -22,13 +22,9 @@ const uint32 kResizeTeamIcons = 'RTIs';
const uint32 kAutoRaise = 'AtRs';
const uint32 kAutoHide = 'AtHd';
-class BBox;
-class BButton;
class BCheckBox;
-class BListView;
class BRadioButton;
class BSlider;
-class BStringView;
class BTextControl;
class PreferencesWindow : public BWindow
@@ -37,12 +33,12 @@ public:
PreferencesWindow(BRect
frame);
~PreferencesWindow();
- virtual void MessageReceived(BMessage* message);
- virtual bool QuitRequested();
- virtual void WindowActivated(bool active);
+ virtual void MessageReceived(BMessage* message);
+ virtual bool QuitRequested();
+ virtual void WindowActivated(bool active);
- void UpdateRecentCounts();
- void EnableDisableDependentItems();
+ void UpdateRecentCounts();
+ void EnableDisableDependentItems();
private:
BCheckBox* fMenuRecentDocuments;
############################################################################
Revision: hrev45157
Commit: c5d129a27ae16c605e089a23158207d1f8532f00
URL: http://cgit.haiku-os.org/haiku/commit/?id=c5d129a
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Mon Jan 14 20:16:22 2013 UTC
Style changes only
----------------------------------------------------------------------------
diff --git a/src/apps/deskbar/BarApp.h b/src/apps/deskbar/BarApp.h
index 0427150..86535da 100644
--- a/src/apps/deskbar/BarApp.h
+++ b/src/apps/deskbar/BarApp.h
@@ -103,6 +103,7 @@ struct clock_settings {
bool showTimeZone;
};
+
class BFile;
class BList;
class BBitmap;
@@ -110,66 +111,68 @@ class PreferencesWindow;
class TBarView;
class TBarWindow;
-
class BarTeamInfo {
public:
- BarTeamInfo(BList* teams, uint32 flags, char* sig, BBitmap* icon,
- char* name);
- BarTeamInfo(const BarTeamInfo &info);
- ~BarTeamInfo();
-
- BList* teams;
- uint32 flags;
- char* sig;
- BBitmap* icon;
- char* name;
+
BarTeamInfo(BList* teams, uint32 flags,
+
char* sig, BBitmap* icon, char* name);
+
BarTeamInfo(const BarTeamInfo &info);
+
~BarTeamInfo();
+
+ BList* teams;
+ uint32 flags;
+ char* sig;
+ BBitmap* icon;
+ char* name;
};
-
class TBarApp : public BApplication {
- public:
- TBarApp();
- virtual ~TBarApp();
-
- virtual bool QuitRequested();
- virtual void MessageReceived(BMessage* message);
- virtual void RefsReceived(BMessage* refs);
-
- desk_settings* Settings() { return &fSettings; }
- clock_settings* ClockSettings() { return &fClockSettings; }
- TBarView* BarView() const { return fBarView; }
- TBarWindow* BarWindow() const { return fBarWindow; }
-
- static void Subscribe(const BMessenger &subscriber, BList*);
- static void Unsubscribe(const BMessenger &subscriber);
- int32 IconSize();
-
- private:
- void AddTeam(team_id team, uint32 flags, const char* sig,
entry_ref*);
- void RemoveTeam(team_id);
-
- void InitSettings();
- void SaveSettings();
-
- void ShowPreferencesWindow();
- void ResizeTeamIcons();
- void FetchAppIcon(const char* signature, BBitmap* icon);
- BRect IconRect();
-
- TBarWindow* fBarWindow;
- TBarView* fBarView;
- BMessenger fSwitcherMessenger;
- BMessenger fStatusViewMessenger;
- BFile* fSettingsFile;
- BFile* fClockSettingsFile;
- desk_settings fSettings;
- clock_settings fClockSettings;
-
- PreferencesWindow* fPreferencesWindow;
-
- static BLocker sSubscriberLock;
- static BList sBarTeamInfoList;
- static BList sSubscribers;
+public:
+
TBarApp();
+ virtual ~TBarApp();
+
+ virtual bool QuitRequested();
+ virtual void
MessageReceived(BMessage* message);
+ virtual void RefsReceived(BMessage*
refs);
+
+ desk_settings* Settings() { return
&fSettings; }
+ clock_settings* ClockSettings() {
return &fClockSettings; }
+
+ TBarView* BarView() const
{ return fBarView; }
+ TBarWindow* BarWindow()
const { return fBarWindow; }
+
+ static void Subscribe(const
BMessenger &subscriber,
+
BList*);
+ static void Unsubscribe(const
BMessenger &subscriber);
+
+ int32 IconSize();
+
+private:
+ void AddTeam(team_id
team, uint32 flags,
+
const char* sig, entry_ref*);
+ void
RemoveTeam(team_id);
+
+ void InitSettings();
+ void SaveSettings();
+
+ void
ShowPreferencesWindow();
+ void
ResizeTeamIcons();
+ void
FetchAppIcon(const char* signature,
+
BBitmap* icon);
+
+ BRect IconRect();
+ TBarWindow* fBarWindow;
+ TBarView* fBarView;
+ BMessenger
fSwitcherMessenger;
+ BMessenger
fStatusViewMessenger;
+ BFile* fSettingsFile;
+ BFile*
fClockSettingsFile;
+ desk_settings fSettings;
+ clock_settings fClockSettings;
+ PreferencesWindow* fPreferencesWindow;
+
+ static BLocker sSubscriberLock;
+ static BList sBarTeamInfoList;
+ static BList sSubscribers;
};
Other related posts:
- » [haiku-commits] haiku: hrev45157 - src/apps/deskbar - jscipione
