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

Icon-O-Matic: Adjust save file panel title as intended.

Browse Source 
* SetExportMode() was supposed to toggle the panel title from "*Save*" to
   "*Export*", but never called Window()->SetTitle().
 * Remove now duplicate translation from constructor.
This commit is contained in:
Stephan Aßmus
2013-12-26 00:18:57 +01:00
parent 2ae82f9fb5
commit 493c0c2b51
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/icon-o-matic/gui/SavePanel.cpp
+13 -8
View File
@@ -71,16 +71,16 @@ SavePanel::SavePanel(const char* name,
if (!window || !window->Lock()) if (!window || !window->Lock())
return; return;
window->SetTitle(B_TRANSLATE("Save image"));
// add this instance as BHandler to the window's looper // add this instance as BHandler to the window's looper
window->AddHandler(this); window->AddHandler(this);
// find a couple of important views and mess with their layout // find a couple of important views and mess with their layout
BView* background = Window()->ChildAt(0); BView* background = Window()->ChildAt(0);
BButton* cancel = dynamic_cast<BButton*>(background->FindView("cancel button")); BButton* cancel = dynamic_cast<BButton*>(
background->FindView("cancel button"));
BView* textview = background->FindView("text view"); BView* textview = background->FindView("text view");
BScrollBar* hscrollbar = dynamic_cast<BScrollBar*>(background->FindView("HScrollBar")); BScrollBar* hscrollbar = dynamic_cast<BScrollBar*>(
background->FindView("HScrollBar"));
if (!background || !cancel || !textview || !hscrollbar) { if (!background || !cancel || !textview || !hscrollbar) {
printf("SavePanel::SavePanel() - couldn't find necessary controls.\n"); printf("SavePanel::SavePanel() - couldn't find necessary controls.\n");
@@ -141,7 +141,8 @@ SavePanel::SavePanel(const char* name,
textview->ResizeTo(fSettingsB->Frame().right - fFormatMF->Frame().left, textview->ResizeTo(fSettingsB->Frame().right - fFormatMF->Frame().left,
textview->Frame().Height()); textview->Frame().Height());
// Make sure the smallest window won't draw the "Settings" button over anything else // Make sure the smallest window won't draw the "Settings" button over
// anything else
float minWindowWidth = textview->Bounds().Width() float minWindowWidth = textview->Bounds().Width()
+ cancel->Bounds().Width() + cancel->Bounds().Width()
+ (insert ? insert->Bounds().Width() : 0.0) + (insert ? insert->Bounds().Width() : 0.0)
@@ -151,6 +152,9 @@ SavePanel::SavePanel(const char* name,
Window()->ResizeTo(minWindowWidth, Window()->Bounds().Height()); Window()->ResizeTo(minWindowWidth, Window()->Bounds().Height());
// Init window title
SetExportMode(true);
window->Unlock(); window->Unlock();
} }
@@ -201,12 +205,12 @@ SavePanel::SetExportMode(bool exportMode)
return; return;
// adjust window title and enable format menu // adjust window title and enable format menu
BString helper("Icon-O-Matic: "); BString title("Icon-O-Matic: ");
if (exportMode) { if (exportMode) {
fFormatMF->SetEnabled(true); fFormatMF->SetEnabled(true);
SetExportMode(fExportMode); SetExportMode(fExportMode);
_EnableSettings(); _EnableSettings();
helper << B_TRANSLATE_CONTEXT("Export Icon", "Dialog title"); title << B_TRANSLATE_CONTEXT("Export icon", "Dialog title");
} else { } else {
fExportMode = ExportMode(); fExportMode = ExportMode();
// does not overwrite fExportMode in case we already were // does not overwrite fExportMode in case we already were
@@ -215,9 +219,10 @@ SavePanel::SetExportMode(bool exportMode)
fFormatMF->SetEnabled(false); fFormatMF->SetEnabled(false);
fSettingsB->SetEnabled(false); fSettingsB->SetEnabled(false);
helper << B_TRANSLATE_CONTEXT("Save Icon", "Dialog title"); title << B_TRANSLATE_CONTEXT("Save icon", "Dialog title");
} }
window->SetTitle(title);
window->Unlock(); window->Unlock();
} }