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

SoftwareUpdater fixes and network status check

Browse Source 
Bug fix- use a proper sized 32 pixel application icon for notifications
Bug fix- sorting list of packages to install and uninstall added
Removed use of FinalWindow class now that resizing issues are resolved
Diaplsy alert if no network connections are found at application start
This commit is contained in:
Brian Hill
2017-03-19 18:05:02 -04:00
parent acdfec1189
commit 9458fd57e2
10 changed files with 244 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/softwareupdater/Jamfile
+1 -1
View File
@@ -15,6 +15,6 @@ Application SoftwareUpdater :
# package_daemon # package_daemon
ProblemWindow.cpp ProblemWindow.cpp
: be localestub package translation [ TargetLibsupc++ ] : be localestub package translation libbnetapi.so [ TargetLibsupc++ ]
: SoftwareUpdater.rdef : SoftwareUpdater.rdef
; ;
src/apps/softwareupdater/SoftwareUpdaterWindow.cpp
+76 -103
View File
@@ -39,7 +39,6 @@ SoftwareUpdaterWindow::SoftwareUpdaterWindow()
fUpdateButton(NULL), fUpdateButton(NULL),
fCancelButton(NULL), fCancelButton(NULL),
fStatusBar(NULL), fStatusBar(NULL),
fIcon(NULL),
fCurrentState(STATE_HEAD), fCurrentState(STATE_HEAD),
fWaitingSem(-1), fWaitingSem(-1),
fWaitingForButton(false), fWaitingForButton(false),
@@ -47,24 +46,15 @@ SoftwareUpdaterWindow::SoftwareUpdaterWindow()
fWarningAlertCount(0) fWarningAlertCount(0)
{ {
int32 iconSize = int(be_plain_font->Size() * 32.0 / 12.0); int32 iconSize = int(be_plain_font->Size() * 32.0 / 12.0);
fIcon = new BBitmap(BRect(0, 0, iconSize - 1, iconSize - 1), 0, B_RGBA32); // At 12 point font, icon size is 32, at 24 point it is 64
team_info teamInfo; BBitmap icon = GetIcon(iconSize);
get_team_info(B_CURRENT_TEAM, &teamInfo); fStripeView = new StripeView(icon);
app_info appInfo;
be_roster->GetRunningAppInfo(teamInfo.team, &appInfo);
BNodeInfo::GetTrackerIcon(&appInfo.ref, fIcon, icon_size(iconSize));
fStripeView = new StripeView(fIcon);
fUpdateButton = new BButton(B_TRANSLATE("Update now"), fUpdateButton = new BButton(B_TRANSLATE("Update now"),
new BMessage(kMsgUpdateConfirmed)); new BMessage(kMsgUpdateConfirmed));
fUpdateButton->MakeDefault(true); fUpdateButton->MakeDefault(true);
// fUpdateButton->SetExplicitAlignment(BAlignment(B_ALIGN_HORIZONTAL_UNSET,
// B_ALIGN_BOTTOM));
fCancelButton = new BButton(B_TRANSLATE("Cancel"), fCancelButton = new BButton(B_TRANSLATE("Cancel"),
new BMessage(kMsgCancel)); new BMessage(kMsgCancel));
// fCancelButton->SetExplicitAlignment(BAlignment(B_ALIGN_HORIZONTAL_UNSET,
// B_ALIGN_BOTTOM));
fHeaderView = new BStringView("header", fHeaderView = new BStringView("header",
B_TRANSLATE("Checking for updates"), B_WILL_DRAW); B_TRANSLATE("Checking for updates"), B_WILL_DRAW);
@@ -134,12 +124,6 @@ SoftwareUpdaterWindow::SoftwareUpdaterWindow()
} }
SoftwareUpdaterWindow::~SoftwareUpdaterWindow()
{
delete fIcon;
}
void void
SoftwareUpdaterWindow::MessageReceived(BMessage* message) SoftwareUpdaterWindow::MessageReceived(BMessage* message)
{ {
@@ -198,6 +182,12 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
case kMsgCancel: case kMsgCancel:
{ {
if (_GetState() == STATE_FINAL_MESSAGE) {
PostMessage(B_QUIT_REQUESTED);
be_app->PostMessage(kMsgFinalQuit);
break;
}
BAlert* alert = new BAlert("cancel request", B_TRANSLATE("Updates" BAlert* alert = new BAlert("cancel request", B_TRANSLATE("Updates"
" have not been completed, are you sure you want to quit?"), " have not been completed, are you sure you want to quit?"),
B_TRANSLATE("Quit"), B_TRANSLATE("Don't quit"), NULL, B_TRANSLATE("Quit"), B_TRANSLATE("Don't quit"), NULL,
@@ -219,6 +209,7 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
fHeaderView->SetText(B_TRANSLATE("Cancelling updates")); fHeaderView->SetText(B_TRANSLATE("Cancelling updates"));
fDetailView->SetText( fDetailView->SetText(
B_TRANSLATE("Attempting to cancel the updates...")); B_TRANSLATE("Attempting to cancel the updates..."));
fCancelButton->SetEnabled(false);
Unlock(); Unlock();
fUserCancelRequested = true; fUserCancelRequested = true;
@@ -244,6 +235,21 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
fWarningAlertCount--; fWarningAlertCount--;
break; break;
case kMsgNetworkAlert:
{
BAlert* alert = new BAlert("network_connection",
B_TRANSLATE_COMMENT("No active network connection was found",
"Alert message"),
B_TRANSLATE_COMMENT("Continue anyway", "Alert button label"),
B_TRANSLATE_COMMENT("Quit","Alert button label"),
NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
int32 result = alert->Go();
BMessage reply;
reply.AddInt32(kKeyAlertResult, result);
message->SendReply(&reply);
break;
}
default: default:
BWindow::MessageReceived(message); BWindow::MessageReceived(message);
} }
@@ -314,6 +320,40 @@ SoftwareUpdaterWindow::ShowWarningAlert(const char* text)
} }
BBitmap
SoftwareUpdaterWindow::GetIcon(int32 iconSize)
{
BBitmap icon(BRect(0, 0, iconSize - 1, iconSize - 1), 0, B_RGBA32);
team_info teamInfo;
get_team_info(B_CURRENT_TEAM, &teamInfo);
app_info appInfo;
be_roster->GetRunningAppInfo(teamInfo.team, &appInfo);
BNodeInfo::GetTrackerIcon(&appInfo.ref, &icon, icon_size(iconSize));
return icon;
}
BBitmap
SoftwareUpdaterWindow::GetNotificationIcon()
{
return GetIcon(B_LARGE_ICON);
}
void
SoftwareUpdaterWindow::FinalUpdate(const char* header, const char* detail)
{
if (_GetState() == STATE_FINAL_MESSAGE)
return;
_SetState(STATE_FINAL_MESSAGE);
Lock();
fHeaderView->SetText(header);
fDetailView->SetText(detail);
Unlock();
}
BLayoutItem* BLayoutItem*
SoftwareUpdaterWindow::layout_item_for(BView* view) SoftwareUpdaterWindow::layout_item_for(BView* view)
{ {
@@ -368,6 +408,14 @@ SoftwareUpdaterWindow::_SetState(uint32 state)
fDefaultRect.Height() + 4 * fListView->ItemHeight(), 9999); fDefaultRect.Height() + 4 * fListView->ItemHeight(), 9999);
ResizeTo(defaultWidth, .75 * defaultWidth); ResizeTo(defaultWidth, .75 * defaultWidth);
} }
else if (fCurrentState == STATE_FINAL_MESSAGE) {
fPackagesLayoutItem->SetVisible(false);
float defaultWidth = fDefaultRect.Width();
float defaultHeight = fDefaultRect.Height();
SetSizeLimits(defaultWidth, defaultWidth, defaultHeight,
defaultHeight);
ResizeTo(defaultWidth, defaultHeight);
}
// Progress bar and string view // Progress bar and string view
// Hide detail text while showing status bar // Hide detail text while showing status bar
@@ -381,6 +429,8 @@ SoftwareUpdaterWindow::_SetState(uint32 state)
} }
// Cancel button // Cancel button
if (fCurrentState == STATE_FINAL_MESSAGE)
fCancelButton->SetLabel(B_TRANSLATE("Quit"));
fCancelButton->SetEnabled(fCurrentState != STATE_APPLY_UPDATES); fCancelButton->SetEnabled(fCurrentState != STATE_APPLY_UPDATES);
Unlock(); Unlock();
@@ -566,7 +616,7 @@ PackageItem::SetItemHeight(const BFont* font)
int int
PackageItem::ICompare(PackageItem* item) PackageItem::NameCompare(PackageItem* item)
{ {
// sort by package name // sort by package name
return fName.ICompare(item->fName); return fName.ICompare(item->fName);
@@ -578,7 +628,7 @@ SortPackageItems(const BListItem* item1, const BListItem* item2)
{ {
PackageItem* first = (PackageItem*)item1; PackageItem* first = (PackageItem*)item1;
PackageItem* second = (PackageItem*)item2; PackageItem* second = (PackageItem*)item2;
return first->ICompare(second); return first->NameCompare(second);
} }
@@ -648,7 +698,7 @@ PackageListView::AddPackage(uint32 install_type, const char* name,
tooltip.Append(B_TRANSLATE_COMMENT("Updating version", tooltip.Append(B_TRANSLATE_COMMENT("Updating version",
"Tooltip text")) "Tooltip text"))
.Append(" ").Append(cur_ver) .Append(" ").Append(cur_ver)
.Append(" ").Append(B_TRANSLATE("to")) .Append(" ").Append(B_TRANSLATE_COMMENT("to", "Tooltip text"))
.Append(" ").Append(new_ver); .Append(" ").Append(new_ver);
break; break;
} }
@@ -700,6 +750,10 @@ PackageListView::SortItems()
{ {
if (fSuperUpdateItem != NULL) if (fSuperUpdateItem != NULL)
SortItemsUnder(fSuperUpdateItem, true, SortPackageItems); SortItemsUnder(fSuperUpdateItem, true, SortPackageItems);
if (fSuperInstallItem != NULL)
SortItemsUnder(fSuperInstallItem, true, SortPackageItems);
if (fSuperUninstallItem != NULL)
SortItemsUnder(fSuperUninstallItem, true, SortPackageItems);
} }
@@ -714,84 +768,3 @@ PackageListView::ItemHeight()
return fSuperUninstallItem->GetPackageItemHeight(); return fSuperUninstallItem->GetPackageItemHeight();
return 0; return 0;
} }
FinalWindow::FinalWindow(BRect rect, BPoint location, const char* header,
const char* detail)
:
BWindow(rect,
B_TRANSLATE_SYSTEM_NAME("SoftwareUpdater"), B_TITLED_WINDOW,
B_AUTO_UPDATE_SIZE_LIMITS | B_NOT_ZOOMABLE
| B_NOT_CLOSABLE | B_NOT_RESIZABLE),
fHeaderView(NULL),
fDetailView(NULL),
fCancelButton(NULL)
{
int32 iconSize = int(be_plain_font->Size() * 32.0 / 12.0);
fIcon = new BBitmap(BRect(0, 0, iconSize - 1, iconSize - 1), 0, B_RGBA32);
team_info teamInfo;
get_team_info(B_CURRENT_TEAM, &teamInfo);
app_info appInfo;
be_roster->GetRunningAppInfo(teamInfo.team, &appInfo);
BNodeInfo::GetTrackerIcon(&appInfo.ref, fIcon, icon_size(iconSize));
SetSizeLimits(rect.Width(), B_SIZE_UNLIMITED, 0, B_SIZE_UNLIMITED);
fStripeView = new StripeView(fIcon);
fHeaderView = new BStringView("header", header, B_WILL_DRAW);
fHeaderView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
fHeaderView->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP));
fDetailView = new BStringView("detail", detail, B_WILL_DRAW);
fDetailView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
fDetailView->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP));
fCancelButton = new BButton(B_TRANSLATE("Quit"),
new BMessage(kMsgCancel));
fCancelButton->MakeDefault(true);
BFont font;
fHeaderView->GetFont(&font);
font.SetFace(B_BOLD_FACE);
font.SetSize(font.Size() * 1.5);
fHeaderView->SetFont(&font, B_FONT_FAMILY_AND_STYLE | B_FONT_SIZE
| B_FONT_FLAGS);
BLayoutBuilder::Group<>(this, B_HORIZONTAL, 0)
.Add(fStripeView)
.AddGroup(B_VERTICAL, 0)
.SetInsets(0, B_USE_WINDOW_SPACING,
B_USE_WINDOW_SPACING, B_USE_WINDOW_SPACING)
.AddGroup(B_VERTICAL, B_USE_ITEM_SPACING)
.Add(fHeaderView)
.Add(fDetailView)
.AddGroup(B_HORIZONTAL)
.AddGlue()
.Add(fCancelButton)
.End()
.End()
.End()
.End();
MoveTo(location);
Show();
}
FinalWindow::~FinalWindow()
{
delete fIcon;
}
void
FinalWindow::MessageReceived(BMessage* message)
{
switch (message->what) {
case kMsgCancel:
PostMessage(B_QUIT_REQUESTED);
be_app->PostMessage(kMsgFinalQuit);
break;
default:
BWindow::MessageReceived(message);
}
}
src/apps/softwareupdater/SoftwareUpdaterWindow.h
+95 -116
View File
@@ -33,134 +33,130 @@ enum {
class SuperItem : public BListItem { class SuperItem : public BListItem {
public: public:
SuperItem(const char* label); SuperItem(const char* label);
~SuperItem(); ~SuperItem();
virtual void DrawItem(BView*, BRect, bool); virtual void DrawItem(BView*, BRect, bool);
virtual void Update(BView *owner, const BFont *font); virtual void Update(BView *owner, const BFont *font);
font_height GetFontHeight() { return fFontHeight; }; font_height GetFontHeight() { return fFontHeight; };
float GetPackageItemHeight() float GetPackageItemHeight()
{ return fPackageItemHeight; }; { return fPackageItemHeight; };
BBitmap* GetIcon() { return fPackageIcon; }; BBitmap* GetIcon() { return fPackageIcon; };
int16 GetIconSize() { return fIconSize; }; int16 GetIconSize() { return fIconSize; };
private: private:
void _GetPackageIcon(); void _GetPackageIcon();
BString fLabel; BString fLabel;
BFont fRegularFont; BFont fRegularFont;
BFont fBoldFont; BFont fBoldFont;
font_height fFontHeight; font_height fFontHeight;
float fPackageItemHeight; float fPackageItemHeight;
BBitmap* fPackageIcon; BBitmap* fPackageIcon;
int16 fIconSize; int16 fIconSize;
}; };
class PackageItem : public BListItem { class PackageItem : public BListItem {
public: public:
PackageItem(const char* name, PackageItem(const char* name,
const char* version, const char* version,
const char* summary, const char* summary,
const char* tooltip, const char* tooltip,
SuperItem* super); SuperItem* super);
~PackageItem(); ~PackageItem();
virtual void DrawItem(BView*, BRect, bool); virtual void DrawItem(BView*, BRect, bool);
virtual void Update(BView *owner, const BFont *font); virtual void Update(BView *owner, const BFont *font);
void SetItemHeight(const BFont* font); void SetItemHeight(const BFont* font);
int ICompare(PackageItem* item); int NameCompare(PackageItem* item);
BTextToolTip* ToolTip() { return fToolTip; }; BTextToolTip* ToolTip() { return fToolTip; };
private: private:
BString fName; BString fName;
BString fVersion; BString fVersion;
BString fSummary; BString fSummary;
BTextToolTip* fToolTip; BTextToolTip* fToolTip;
BFont fRegularFont; BFont fRegularFont;
BFont fSmallFont; BFont fSmallFont;
font_height fSmallFontHeight; font_height fSmallFontHeight;
float fSmallTotalHeight; float fSmallTotalHeight;
float fLabelOffset; float fLabelOffset;
SuperItem* fSuperItem; SuperItem* fSuperItem;
}; };
class PackageListView : public BOutlineListView { class PackageListView : public BOutlineListView {
public: public:
PackageListView(); PackageListView();
virtual void FrameResized(float newWidth, float newHeight); virtual void FrameResized(float newWidth, float newHeight);
void AddPackage(uint32 install_type, void AddPackage(uint32 install_type,
const char* name, const char* name,
const char* cur_ver, const char* cur_ver,
const char* new_ver, const char* new_ver,
const char* summary, const char* summary,
const char* repository); const char* repository);
void SortItems(); void SortItems();
float ItemHeight(); float ItemHeight();
protected: protected:
virtual bool GetToolTipAt(BPoint point, BToolTip** _tip); virtual bool GetToolTipAt(BPoint point, BToolTip** _tip);
private: private:
SuperItem* fSuperUpdateItem; SuperItem* fSuperUpdateItem;
SuperItem* fSuperInstallItem; SuperItem* fSuperInstallItem;
SuperItem* fSuperUninstallItem; SuperItem* fSuperUninstallItem;
}; };
class SoftwareUpdaterWindow : public BWindow { class SoftwareUpdaterWindow : public BWindow {
public: public:
SoftwareUpdaterWindow(); SoftwareUpdaterWindow();
~SoftwareUpdaterWindow(); void MessageReceived(BMessage* message);
bool ConfirmUpdates(const char* text);
void MessageReceived(BMessage* message); void UpdatesApplying(const char* header,
bool ConfirmUpdates(const char* text); const char* detail);
void UpdatesApplying(const char* header, bool UserCancelRequested();
const char* detail); void AddPackageInfo(uint32 install_type,
bool UserCancelRequested(); const char* package_name,
void AddPackageInfo(uint32 install_type, const char* cur_ver,
const char* package_name, const char* new_ver,
const char* cur_ver, const char* summary,
const char* new_ver, const char* repository);
const char* summary, void ShowWarningAlert(const char* text);
const char* repository); BBitmap GetIcon(int32 iconSize);
void ShowWarningAlert(const char* text); BBitmap GetNotificationIcon();
const BBitmap* GetIcon() { return fIcon; }; BRect GetDefaultRect() { return fDefaultRect; };
BRect GetDefaultRect() { return fDefaultRect; }; BPoint GetLocation() { return Frame().LeftTop(); };
BPoint GetLocation() { return Frame().LeftTop(); }; BLayoutItem* layout_item_for(BView* view);
BLayoutItem* layout_item_for(BView* view); void FinalUpdate(const char* header,
const char* detail);
private: private:
uint32 _WaitForButtonClick(); uint32 _WaitForButtonClick();
void _SetState(uint32 state); void _SetState(uint32 state);
uint32 _GetState(); uint32 _GetState();
BRect fDefaultRect; BRect fDefaultRect;
StripeView* fStripeView; StripeView* fStripeView;
BStringView* fHeaderView; BStringView* fHeaderView;
BStringView* fDetailView; BStringView* fDetailView;
BButton* fUpdateButton; BButton* fUpdateButton;
BButton* fCancelButton; BButton* fCancelButton;
BStatusBar* fStatusBar; BStatusBar* fStatusBar;
#if USE_PANE_SWITCH
PaneSwitch* fPackagesSwitch;
BLayoutItem* fPkgSwitchLayoutItem;
#endif
PackageListView* fListView; PackageListView* fListView;
BScrollView* fScrollView; BScrollView* fScrollView;
BLayoutItem* fDetailsLayoutItem; BLayoutItem* fDetailsLayoutItem;
BLayoutItem* fPackagesLayoutItem; BLayoutItem* fPackagesLayoutItem;
BLayoutItem* fProgressLayoutItem; BLayoutItem* fProgressLayoutItem;
BLayoutItem* fUpdateButtonLayoutItem; BLayoutItem* fUpdateButtonLayoutItem;
BBitmap* fIcon;
uint32 fCurrentState; uint32 fCurrentState;
sem_id fWaitingSem; sem_id fWaitingSem;
bool fWaitingForButton; bool fWaitingForButton;
uint32 fButtonResult; uint32 fButtonResult;
bool fUserCancelRequested; bool fUserCancelRequested;
BInvoker fCancelAlertResponse; BInvoker fCancelAlertResponse;
int32 fWarningAlertCount; int32 fWarningAlertCount;
BInvoker fWarningAlertDismissed; BInvoker fWarningAlertDismissed;
}; };
@@ -168,21 +164,4 @@ private:
int SortPackageItems(const BListItem* item1, const BListItem* item2); int SortPackageItems(const BListItem* item1, const BListItem* item2);
class FinalWindow : public BWindow {
public:
FinalWindow(BRect rect, BPoint location,
const char* header, const char* detail);
~FinalWindow();
void MessageReceived(BMessage* message);
private:
StripeView* fStripeView;
BStringView* fHeaderView;
BStringView* fDetailView;
BButton* fCancelButton;
BBitmap* fIcon;
};
#endif // _SOFTWARE_UPDATER_WINDOW_H #endif // _SOFTWARE_UPDATER_WINDOW_H
src/apps/softwareupdater/StripeView.cpp
+13 -10
View File
@@ -15,18 +15,21 @@
#include <LayoutUtils.h> #include <LayoutUtils.h>
StripeView::StripeView(BBitmap* icon) static const float kTopOffset = 10.0f;
StripeView::StripeView(BBitmap& icon)
: :
BView("StripeView", B_WILL_DRAW), BView("StripeView", B_WILL_DRAW),
fIcon(icon), fIcon(icon),
fWidth(0.0), fIconSize(0.0),
fStripeWidth(0.0) fWidth(0.0)
{ {
SetViewUIColor(B_PANEL_BACKGROUND_COLOR); SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
if (icon != NULL) { if (fIcon.IsValid()) {
fStripeWidth = icon->Bounds().Width(); fIconSize = fIcon.Bounds().Width();
fWidth = 2 * fStripeWidth + 2.0f; fWidth = 2 * fIconSize + 2.0f;
} }
} }
@@ -34,20 +37,20 @@ StripeView::StripeView(BBitmap* icon)
void void
StripeView::Draw(BRect updateRect) StripeView::Draw(BRect updateRect)
{ {
if (fIcon == NULL) if (fIconSize == 0)
return; return;
SetHighColor(ViewColor()); SetHighColor(ViewColor());
FillRect(updateRect); FillRect(updateRect);
BRect stripeRect = Bounds(); BRect stripeRect = Bounds();
stripeRect.right = fStripeWidth; stripeRect.right = fIconSize;
SetHighColor(tint_color(ViewColor(), B_DARKEN_1_TINT)); SetHighColor(tint_color(ViewColor(), B_DARKEN_1_TINT));
FillRect(stripeRect); FillRect(stripeRect);
SetDrawingMode(B_OP_ALPHA); SetDrawingMode(B_OP_ALPHA);
SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY); SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
DrawBitmapAsync(fIcon, BPoint(fStripeWidth / 2.0f, 10.0f)); DrawBitmapAsync(&fIcon, BPoint(fIconSize / 2.0f, kTopOffset));
} }
@@ -65,7 +68,7 @@ StripeView::GetPreferredSize(float* _width, float* _height)
*_width = fWidth; *_width = fWidth;
if (_height != NULL) if (_height != NULL)
*_height = fStripeWidth + 20.0f; *_height = fIconSize + 2 * kTopOffset;
} }
src/apps/softwareupdater/StripeView.h
+3 -3
View File
@@ -18,7 +18,7 @@
class StripeView : public BView { class StripeView : public BView {
public: public:
StripeView(BBitmap* icon); StripeView(BBitmap& icon);
virtual void Draw(BRect updateRect); virtual void Draw(BRect updateRect);
virtual BSize PreferredSize(); virtual BSize PreferredSize();
@@ -26,9 +26,9 @@ public:
virtual BSize MaxSize(); virtual BSize MaxSize();
private: private:
BBitmap* fIcon; BBitmap fIcon;
float fIconSize;
float fWidth; float fWidth;
float fStripeWidth;
}; };
src/apps/softwareupdater/UpdateAction.cpp
+2 -4
View File
@@ -42,6 +42,8 @@ status_t
UpdateAction::Perform() UpdateAction::Perform()
{ {
try { try {
fUpdateManager->CheckNetworkConnection();
fUpdateManager->Init(BPackageManager::B_ADD_INSTALLED_REPOSITORIES fUpdateManager->Init(BPackageManager::B_ADD_INSTALLED_REPOSITORIES
| BPackageManager::B_ADD_REMOTE_REPOSITORIES | BPackageManager::B_ADD_REMOTE_REPOSITORIES
| BPackageManager::B_REFRESH_REPOSITORIES); | BPackageManager::B_REFRESH_REPOSITORIES);
@@ -61,10 +63,6 @@ UpdateAction::Perform()
fprintf(stderr, "Updates aborted by user: %s\n", fprintf(stderr, "Updates aborted by user: %s\n",
ex.Message().String()); ex.Message().String());
// No need for a final message since user initiated cancel request // No need for a final message since user initiated cancel request
// Note: activate FinalUpdate() call for testing final message window
//fUpdateManager->FinalUpdate(B_TRANSLATE("Updates cancelled"),
// B_TRANSLATE("No packages have been updated."));
// Note: comment out when testing final message window
be_app->PostMessage(kMsgFinalQuit); be_app->PostMessage(kMsgFinalQuit);
return B_OK; return B_OK;
} catch (BNothingToDoException ex) { } catch (BNothingToDoException ex) {
src/apps/softwareupdater/UpdateAction.h
-1
View File
@@ -19,7 +19,6 @@ public:
status_t Perform(); status_t Perform();
private: private:
UpdateManager* fUpdateManager; UpdateManager* fUpdateManager;
}; };
src/apps/softwareupdater/UpdateManager.cpp
+50 -16
View File
@@ -17,6 +17,10 @@
#include <Alert.h> #include <Alert.h>
#include <Catalog.h> #include <Catalog.h>
#include <Message.h>
#include <Messenger.h>
#include <NetworkInterface.h>
#include <NetworkRoster.h>
#include <Notification.h> #include <Notification.h>
#include <package/CommitTransactionResult.h> #include <package/CommitTransactionResult.h>
@@ -45,7 +49,6 @@ UpdateManager::UpdateManager(BPackageInstallationLocation location)
BPackageManager::UserInteractionHandler(), BPackageManager::UserInteractionHandler(),
fClientInstallationInterface(), fClientInstallationInterface(),
fStatusWindow(NULL), fStatusWindow(NULL),
fFinalWindow(NULL),
fCurrentStep(ACTION_STEP_INIT), fCurrentStep(ACTION_STEP_INIT),
fChangesConfirmed(false) fChangesConfirmed(false)
{ {
@@ -58,13 +61,48 @@ UpdateManager::~UpdateManager()
{ {
if (fStatusWindow != NULL) if (fStatusWindow != NULL)
fStatusWindow->PostMessage(B_QUIT_REQUESTED); fStatusWindow->PostMessage(B_QUIT_REQUESTED);
if (fFinalWindow != NULL)
fFinalWindow->PostMessage(B_QUIT_REQUESTED);
if (fProblemWindow != NULL) if (fProblemWindow != NULL)
fProblemWindow->PostMessage(B_QUIT_REQUESTED); fProblemWindow->PostMessage(B_QUIT_REQUESTED);
} }
void
UpdateManager::CheckNetworkConnection()
{
BNetworkRoster& roster = BNetworkRoster::Default();
BNetworkInterface interface;
uint32 cookie = 0;
while (roster.GetNextInterface(&cookie, interface) == B_OK) {
uint32 flags = interface.Flags();
if ((flags & IFF_LOOPBACK) == 0
&& (flags & (IFF_UP | IFF_LINK)) == (IFF_UP | IFF_LINK)) {
return;
}
}
// No network connection detected, display warning
int32 result = 0;
BMessenger messenger(fStatusWindow);
if (messenger.IsValid()) {
BMessage message(kMsgNetworkAlert);
BMessage reply;
messenger.SendMessage(&message, &reply);
reply.FindInt32(kKeyAlertResult, &result);
}
else {
BAlert* alert = new BAlert("network_connection",
B_TRANSLATE_COMMENT("No active network connection was found",
"Alert message"),
B_TRANSLATE_COMMENT("Continue anyway", "Alert button label"),
B_TRANSLATE_COMMENT("Quit","Alert button label"),
NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
result = alert->Go();
}
if (result)
throw BAbortedByUserException();
}
void void
UpdateManager::JobFailed(BSupportKit::BJob* job) UpdateManager::JobFailed(BSupportKit::BJob* job)
{ {
@@ -230,8 +268,11 @@ UpdateManager::Warn(status_t error, const char* format, ...)
else else
printf(": %s\n", strerror(error)); printf(": %s\n", strerror(error));
if (fStatusWindow != NULL) if (fStatusWindow != NULL) {
if (fStatusWindow->UserCancelRequested())
throw BAbortedByUserException();
fStatusWindow->ShowWarningAlert(buffer); fStatusWindow->ShowWarningAlert(buffer);
}
else { else {
BString text("SoftwareUpdater:\n"); BString text("SoftwareUpdater:\n");
text.Append(buffer); text.Append(buffer);
@@ -542,26 +583,19 @@ UpdateManager::_UpdateDownloadProgress(const char* header,
void void
UpdateManager::_FinalUpdate(const char* header, const char* text) UpdateManager::_FinalUpdate(const char* header, const char* text)
{ {
if (fFinalWindow != NULL)
return;
BNotification notification(B_INFORMATION_NOTIFICATION); BNotification notification(B_INFORMATION_NOTIFICATION);
notification.SetGroup("SoftwareUpdater"); notification.SetGroup("SoftwareUpdater");
notification.SetTitle(header); notification.SetTitle(header);
notification.SetContent(text); notification.SetContent(text);
const BBitmap* icon = fStatusWindow->GetIcon(); BBitmap icon(fStatusWindow->GetNotificationIcon());
if (icon != NULL) if (icon.IsValid())
notification.SetIcon(icon); notification.SetIcon(&icon);
notification.Send(); notification.Send();
BPoint location(fStatusWindow->GetLocation()); fStatusWindow->FinalUpdate(header, text);
BRect rect(fStatusWindow->GetDefaultRect());
fStatusWindow->PostMessage(B_QUIT_REQUESTED);
fStatusWindow = NULL;
fFinalWindow = new FinalWindow(rect, location, header, text);
} }
void void
UpdateManager::_SetCurrentStep(int32 step) UpdateManager::_SetCurrentStep(int32 step)
{ {
src/apps/softwareupdater/UpdateManager.h
+1 -4
View File
@@ -30,19 +30,17 @@ public:
BPackageKit::BPackageInstallationLocation location); BPackageKit::BPackageInstallationLocation location);
~UpdateManager(); ~UpdateManager();
void CheckNetworkConnection();
virtual void JobFailed(BSupportKit::BJob* job); virtual void JobFailed(BSupportKit::BJob* job);
virtual void JobAborted(BSupportKit::BJob* job); virtual void JobAborted(BSupportKit::BJob* job);
void FinalUpdate(const char* header, void FinalUpdate(const char* header,
const char* text); const char* text);
private: private:
// UserInteractionHandler // UserInteractionHandler
virtual void HandleProblems(); virtual void HandleProblems();
virtual void ConfirmChanges(bool fromMostSpecific); virtual void ConfirmChanges(bool fromMostSpecific);
virtual void Warn(status_t error, const char* format, ...); virtual void Warn(status_t error, const char* format, ...);
virtual void ProgressPackageDownloadStarted( virtual void ProgressPackageDownloadStarted(
const char* packageName); const char* packageName);
virtual void ProgressPackageDownloadActive( virtual void ProgressPackageDownloadActive(
@@ -85,7 +83,6 @@ private:
fClientInstallationInterface; fClientInstallationInterface;
SoftwareUpdaterWindow* fStatusWindow; SoftwareUpdaterWindow* fStatusWindow;
FinalWindow* fFinalWindow;
ProblemWindow* fProblemWindow; ProblemWindow* fProblemWindow;
uint32 fCurrentStep; uint32 fCurrentStep;
bool fChangesConfirmed; bool fChangesConfirmed;
src/apps/softwareupdater/constants.h
+3
View File
@@ -23,6 +23,7 @@ enum {
STATE_DISPLAY_PROGRESS, STATE_DISPLAY_PROGRESS,
STATE_GET_CONFIRMATION, STATE_GET_CONFIRMATION,
STATE_APPLY_UPDATES, STATE_APPLY_UPDATES,
STATE_FINAL_MESSAGE,
STATE_MAX STATE_MAX
}; };
@@ -33,6 +34,7 @@ static const uint32 kMsgCancel = 'iCAN';
static const uint32 kMsgCancelResponse = 'iCRE'; static const uint32 kMsgCancelResponse = 'iCRE';
static const uint32 kMsgUpdateConfirmed = 'iCON'; static const uint32 kMsgUpdateConfirmed = 'iCON';
static const uint32 kMsgWarningDismissed = 'iWDI'; static const uint32 kMsgWarningDismissed = 'iWDI';
static const uint32 kMsgNetworkAlert = 'iNAL';
static const uint32 kMsgRegister = 'iREG'; static const uint32 kMsgRegister = 'iREG';
static const uint32 kMsgFinalQuit = 'iFIN'; static const uint32 kMsgFinalQuit = 'iFIN';
@@ -43,6 +45,7 @@ static const uint32 kMsgFinalQuit = 'iFIN';
#define kKeyPackageCount "key_packagecount" #define kKeyPackageCount "key_packagecount"
#define kKeyPercentage "key_percentage" #define kKeyPercentage "key_percentage"
#define kKeyMessenger "key_messenger" #define kKeyMessenger "key_messenger"
#define kKeyAlertResult "key_alertresult"
#endif // CONSTANTS_H #endif // CONSTANTS_H