[haiku-commits] haiku: hrev44244 - src/apps/deskbar
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 16 Jun 2012 22:48:37 +0200 (CEST)
hrev44244 adds 1 changeset to branch 'master'
old head: 919d3b76016bb150d60488e9224e71a87f780eda
new head: a663e9050638c7470918bda00c4f260c30513990
----------------------------------------------------------------------------
a663e90: Fix #8640.
- Automatic whitespace cleanup.
- Remove no longer exposed show/hide time setting. The methodology for
saving it on exit was broken anyways, since it relied on the current
show/hide state of the time view, which would be hidden if the deskbar
was currently in Autohide mode.
[ Rene Gollent <anevilyak@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44244
Commit: a663e9050638c7470918bda00c4f260c30513990
URL: http://cgit.haiku-os.org/haiku/commit/?id=a663e90
Author: Rene Gollent <anevilyak@xxxxxxxxx>
Date: Sat Jun 16 20:45:28 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/8640
----------------------------------------------------------------------------
3 files changed, 8 insertions(+), 21 deletions(-)
src/apps/deskbar/BarApp.cpp | 6 ------
src/apps/deskbar/BarApp.h | 1 -
src/apps/deskbar/StatusView.cpp | 22 ++++++++--------------
----------------------------------------------------------------------------
diff --git a/src/apps/deskbar/BarApp.cpp b/src/apps/deskbar/BarApp.cpp
index 91f2ce8..33c5832 100644
--- a/src/apps/deskbar/BarApp.cpp
+++ b/src/apps/deskbar/BarApp.cpp
@@ -204,7 +204,6 @@ TBarApp::SaveSettings()
storedSettings.AddInt32("state", fSettings.state);
storedSettings.AddFloat("width", fSettings.width);
- storedSettings.AddBool("showTime", fSettings.showTime);
storedSettings.AddBool("showSeconds", fSettings.showSeconds);
storedSettings.AddBool("showDayOfWeek",
fSettings.showDayOfWeek);
@@ -244,7 +243,6 @@ TBarApp::InitSettings()
settings.vertical = true;
settings.left = false;
settings.top = true;
- settings.showTime = true;
settings.showSeconds = false;
settings.showDayOfWeek = false;
settings.state = kExpandoState;
@@ -301,10 +299,6 @@ TBarApp::InitSettings()
}
if (storedSettings.FindFloat("width", &settings.width)
!= B_OK)
settings.width = 0;
- if (storedSettings.FindBool("showTime",
&settings.showTime)
- != B_OK) {
- settings.showTime = true;
- }
if (storedSettings.FindBool("showSeconds",
&settings.showSeconds)
!= B_OK) {
settings.showSeconds = false;
diff --git a/src/apps/deskbar/BarApp.h b/src/apps/deskbar/BarApp.h
index 6dfac18..2c81757 100644
--- a/src/apps/deskbar/BarApp.h
+++ b/src/apps/deskbar/BarApp.h
@@ -75,7 +75,6 @@ struct desk_settings {
bool vertical;
bool left;
bool top;
- bool showTime;
bool showSeconds;
bool showDayOfWeek;
uint32 state;
diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp
index 08da5e9..e32b769 100644
--- a/src/apps/deskbar/StatusView.cpp
+++ b/src/apps/deskbar/StatusView.cpp
@@ -181,11 +181,6 @@ TReplicantTray::AttachedToWindow()
AddChild(fTime);
fTime->MoveTo(Bounds().right - fTime->Bounds().Width() - 1, 2);
- if (!((TBarApp*)be_app)->Settings()->showTime) {
- fTime->Hide();
- RealignReplicants();
- AdjustPlacement();
- }
#ifdef DB_ADDONS
// load addons and rehydrate archives
@@ -438,13 +433,13 @@ TReplicantTray::InitAddOnSupport()
int32 id;
BString path;
if (fAddOnSettings.Unflatten(&file) == B_OK) {
- for (int32 i = 0;
fAddOnSettings.FindString(kReplicantPathField,
+ for (int32 i = 0;
fAddOnSettings.FindString(kReplicantPathField,
i, &path) == B_OK; i++) {
if (entry.SetTo(path.String()) == B_OK
&& entry.Exists()) {
result = LoadAddOn(&entry, &id,
false);
- } else
+ } else
result = B_ENTRY_NOT_FOUND;
-
+
if (result != B_OK) {
fAddOnSettings.RemoveData(kReplicantPathField, i);
--i;
@@ -460,7 +455,7 @@ void
TReplicantTray::DeleteAddOnSupport()
{
_SaveSettings();
-
+
for (int32 i = fItemList->CountItems(); i-- > 0 ;) {
DeskbarItemInfo* item =
(DeskbarItemInfo*)fItemList->RemoveItem(i);
if (item) {
@@ -641,7 +636,7 @@ TReplicantTray::LoadAddOn(BEntry* entry, int32* id, bool
addToSettings)
fAddOnSettings.AddString(kReplicantPathField, path.Path());
_SaveSettings();
}
-
+
return B_OK;
}
@@ -711,7 +706,7 @@ TReplicantTray::RemoveItem(int32 id)
if (item->isAddOn) {
BPath path(&item->entryRef);
BString storedPath;
- for (int32 i = 0;
+ for (int32 i = 0;
fAddOnSettings.FindString(kReplicantPathField, i,
&storedPath)
== B_OK; i++) {
if (storedPath == path.Path()) {
@@ -720,7 +715,7 @@ TReplicantTray::RemoveItem(int32 id)
}
}
_SaveSettings();
-
+
BNode node(&item->entryRef);
watch_node(&item->nodeRef, B_STOP_WATCHING, this, Window());
}
@@ -1225,7 +1220,7 @@ TReplicantTray::_SaveSettings()
path.Append(kReplicantSettingsFile);
BFile file(path.Path(), B_READ_WRITE | B_CREATE_FILE |
B_ERASE_FILE);
- if ((result = file.InitCheck()) == B_OK)
+ if ((result = file.InitCheck()) == B_OK)
result = fAddOnSettings.Flatten(&file);
}
@@ -1240,7 +1235,6 @@ TReplicantTray::SaveTimeSettings()
return;
desk_settings* settings = ((TBarApp*)be_app)->Settings();
- settings->showTime = !fTime->IsHidden();
settings->showSeconds = fTime->ShowSeconds();
settings->showDayOfWeek = fTime->ShowDayOfWeek();
}
Other related posts:
- » [haiku-commits] haiku: hrev44244 - src/apps/deskbar - anevilyak
