i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed non-boot desktop integration checkbox.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19934 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2007-01-23 23:48:54 +00:00
parent 1a4f3a6079
commit 355260f73b
1 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/SettingsViews.cpp
+2 -40
View File
@@ -163,14 +163,7 @@ DesktopSettingsView::DesktopSettingsView(BRect rect)
AddChild(fMountSharedVolumesOntoDesktopCheckBox); AddChild(fMountSharedVolumesOntoDesktopCheckBox);
fMountSharedVolumesOntoDesktopCheckBox->ResizeToPreferred(); fMountSharedVolumesOntoDesktopCheckBox->ResizeToPreferred();
rect.OffsetBy(-20, 2 * itemSpacing); rect.OffsetBy(-20, itemSpacing);
fIntegrateNonBootBeOSDesktopsCheckBox = new BCheckBox(rect, "",
"Integrate Non-Boot BeOS Desktops", new BMessage(kDesktopIntegrationChanged));
AddChild(fIntegrateNonBootBeOSDesktopsCheckBox);
fIntegrateNonBootBeOSDesktopsCheckBox->ResizeToPreferred();
rect.OffsetBy(0, itemSpacing);
fEjectWhenUnmountingCheckBox = new BCheckBox(rect, "", "Eject When Unmounting", fEjectWhenUnmountingCheckBox = new BCheckBox(rect, "", "Eject When Unmounting",
new BMessage(kEjectWhenUnmountingChanged)); new BMessage(kEjectWhenUnmountingChanged));
@@ -193,8 +186,7 @@ void
DesktopSettingsView::GetPreferredSize(float *_width, float *_height) DesktopSettingsView::GetPreferredSize(float *_width, float *_height)
{ {
if (_width != NULL) { if (_width != NULL) {
*_width = max_c(fIntegrateNonBootBeOSDesktopsCheckBox->Frame().right, *_width = fMountSharedVolumesOntoDesktopCheckBox->Frame().right;
fMountSharedVolumesOntoDesktopCheckBox->Frame().right);
} }
if (_height != NULL) { if (_height != NULL) {
@@ -210,7 +202,6 @@ DesktopSettingsView::AttachedToWindow()
fShowDisksIconRadioButton->SetTarget(this); fShowDisksIconRadioButton->SetTarget(this);
fMountVolumesOntoDesktopRadioButton->SetTarget(this); fMountVolumesOntoDesktopRadioButton->SetTarget(this);
fMountSharedVolumesOntoDesktopCheckBox->SetTarget(this); fMountSharedVolumesOntoDesktopCheckBox->SetTarget(this);
fIntegrateNonBootBeOSDesktopsCheckBox->SetTarget(this);
fEjectWhenUnmountingCheckBox->SetTarget(this); fEjectWhenUnmountingCheckBox->SetTarget(this);
} }
@@ -289,29 +280,6 @@ DesktopSettingsView::MessageReceived(BMessage *message)
break; break;
} }
case kDesktopIntegrationChanged:
{
// Set the new settings in the tracker:
settings.SetIntegrateNonBootBeOSDesktops(
fIntegrateNonBootBeOSDesktopsCheckBox->Value() == 1);
// Construct the notification message:
BMessage notificationMessage;
notificationMessage.AddBool("MountVolumesOntoDesktop",
fMountVolumesOntoDesktopRadioButton->Value() == 1);
notificationMessage.AddBool("MountSharedVolumesOntoDesktop",
fMountSharedVolumesOntoDesktopCheckBox->Value() == 1);
notificationMessage.AddBool("IntegrateNonBootBeOSDesktops",
fIntegrateNonBootBeOSDesktopsCheckBox->Value() == 1);
// Send the notification message
tracker->SendNotices(kDesktopIntegrationChanged, &notificationMessage);
// Tell the settings window the contents have changed
Window()->PostMessage(kSettingsContentsModified);
break;
}
case kEjectWhenUnmountingChanged: case kEjectWhenUnmountingChanged:
{ {
settings.SetEjectWhenUnmounting( settings.SetEjectWhenUnmounting(
@@ -380,8 +348,6 @@ DesktopSettingsView::_SendNotices()
fMountVolumesOntoDesktopRadioButton->Value() == 1); fMountVolumesOntoDesktopRadioButton->Value() == 1);
notificationMessage.AddBool("MountSharedVolumesOntoDesktop", notificationMessage.AddBool("MountSharedVolumesOntoDesktop",
fMountSharedVolumesOntoDesktopCheckBox->Value() == 1); fMountSharedVolumesOntoDesktopCheckBox->Value() == 1);
notificationMessage.AddBool("IntegrateNonBootBeOSDesktops",
fIntegrateNonBootBeOSDesktopsCheckBox->Value() == 1);
notificationMessage.AddBool("EjectWhenUnmounting", notificationMessage.AddBool("EjectWhenUnmounting",
fEjectWhenUnmountingCheckBox->Value() == 1); fEjectWhenUnmountingCheckBox->Value() == 1);
@@ -402,8 +368,6 @@ DesktopSettingsView::ShowCurrentSettings()
fMountSharedVolumesOntoDesktopCheckBox->SetValue(settings.MountSharedVolumesOntoDesktop()); fMountSharedVolumesOntoDesktopCheckBox->SetValue(settings.MountSharedVolumesOntoDesktop());
fMountSharedVolumesOntoDesktopCheckBox->SetEnabled(settings.MountVolumesOntoDesktop()); fMountSharedVolumesOntoDesktopCheckBox->SetEnabled(settings.MountVolumesOntoDesktop());
fIntegrateNonBootBeOSDesktopsCheckBox->SetValue(settings.IntegrateNonBootBeOSDesktops());
fEjectWhenUnmountingCheckBox->SetValue(settings.EjectWhenUnmounting()); fEjectWhenUnmountingCheckBox->SetValue(settings.EjectWhenUnmounting());
} }
@@ -429,8 +393,6 @@ DesktopSettingsView::IsRevertable() const
(fMountVolumesOntoDesktopRadioButton->Value() > 0) (fMountVolumesOntoDesktopRadioButton->Value() > 0)
|| fMountSharedVolumesOntoDesktop != || fMountSharedVolumesOntoDesktop !=
(fMountSharedVolumesOntoDesktopCheckBox->Value() > 0) (fMountSharedVolumesOntoDesktopCheckBox->Value() > 0)
|| fIntegrateNonBootBeOSDesktops !=
(fIntegrateNonBootBeOSDesktopsCheckBox->Value() > 0)
|| fEjectWhenUnmounting != || fEjectWhenUnmounting !=
(fEjectWhenUnmountingCheckBox->Value() > 0); (fEjectWhenUnmountingCheckBox->Value() > 0);
} }