From ebaed93917616466b6416e9f56346b5e6b8ca28d Mon Sep 17 00:00:00 2001 From: Ryan Leavengood Date: Tue, 30 Jan 2007 19:24:12 +0000 Subject: [PATCH] We now disable the "Resize..." menu item when a slideshow is started. Not a huge deal but it doesn't make much sense to resize images during a slideshow. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20020 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/showimage/ShowImageWindow.cpp | 4 +++- src/apps/showimage/ShowImageWindow.h | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/apps/showimage/ShowImageWindow.cpp b/src/apps/showimage/ShowImageWindow.cpp index 46383129c8..aee7056f25 100644 --- a/src/apps/showimage/ShowImageWindow.cpp +++ b/src/apps/showimage/ShowImageWindow.cpp @@ -344,7 +344,7 @@ ShowImageWindow::AddMenus(BMenuBar *bar) menu->AddSeparatorItem(); AddItemMenu(menu, "Invert Colors", MSG_INVERT, 0, 0, 'W', true); menu->AddSeparatorItem(); - AddItemMenu(menu, "Resize" B_UTF8_ELLIPSIS, MSG_OPEN_RESIZER_WINDOW, 0, 0, 'W', true); + fResizeItem = AddItemMenu(menu, "Resize" B_UTF8_ELLIPSIS, MSG_OPEN_RESIZER_WINDOW, 0, 0, 'W', true); bar->AddItem(menu); menu->AddSeparatorItem(); AddItemMenu(menu, "Use as Desktop Background", MSG_DESKTOP_BACKGROUND, 0, 0, 'W', true); @@ -767,9 +767,11 @@ ShowImageWindow::MessageReceived(BMessage *message) break; if (item->IsMarked()) { item->SetMarked(false); + fResizeItem->SetEnabled(true); fImageView->StopSlideShow(); } else if (ClosePrompt()) { item->SetMarked(true); + fResizeItem->SetEnabled(false); fImageView->StartSlideShow(); } break; diff --git a/src/apps/showimage/ShowImageWindow.h b/src/apps/showimage/ShowImageWindow.h index ae17bae432..855c098a7f 100644 --- a/src/apps/showimage/ShowImageWindow.h +++ b/src/apps/showimage/ShowImageWindow.h @@ -97,7 +97,8 @@ class ShowImageWindow : public BWindow { bool fShowCaption; BMessage *fPrintSettings; PrintOptions fPrintOptions; - BMessenger* fResizerWindowMessenger; + BMessenger *fResizerWindowMessenger; + BMenuItem *fResizeItem; int32 fHeight, fWidth; };