[haiku-commits] r40441 - in haiku/trunk/src: apps/activitymonitor apps/expander apps/icon-o-matic apps/icon-o-matic/gui apps/text_search ...
- From: humdingerb@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 11 Feb 2011 20:20:11 +0100 (CET)
Author: humdinger
Date: 2011-02-11 20:20:11 +0100 (Fri, 11 Feb 2011)
New Revision: 40441
Changeset: http://dev.haiku-os.org/changeset/40441
Modified:
haiku/trunk/src/apps/activitymonitor/DataSource.cpp
haiku/trunk/src/apps/expander/ExpanderWindow.cpp
haiku/trunk/src/apps/icon-o-matic/Jamfile
haiku/trunk/src/apps/icon-o-matic/gui/PathListView.cpp
haiku/trunk/src/apps/text_search/GrepWindow.cpp
haiku/trunk/src/preferences/filetypes/Jamfile
Log:
* Improved ambiguous commands in Icon-O-Matic. A direction like left/right
when rotating indices doesn't always make sense. Think of an "8" shape.
Reordered these items to give the correct shortcut order Alt+R - Shift+Alt+R.
* More localizing of strings in ActivityMonitor and Expander.
* TextSearch had problems with the search button being to small if one of the
translated strings for Search/Cancel get's bigger than the other. Now resizes
after toggling.
* FileTypes missed a file for the catalog in the Jamfile.
Modified: haiku/trunk/src/apps/activitymonitor/DataSource.cpp
===================================================================
--- haiku/trunk/src/apps/activitymonitor/DataSource.cpp 2011-02-11 18:13:21 UTC
(rev 40440)
+++ haiku/trunk/src/apps/activitymonitor/DataSource.cpp 2011-02-11 19:20:11 UTC
(rev 40441)
@@ -290,7 +290,7 @@
MemoryDataSource::Print(BString& text, int64 value) const
{
char buffer[32];
- snprintf(buffer, sizeof(buffer), "%.1f MB", value / 1048576.0);
+ snprintf(buffer, sizeof(buffer), B_TRANSLATE("%.1f MB"), value /
1048576.0);
text = buffer;
}
@@ -299,7 +299,7 @@
const char*
MemoryDataSource::Unit() const
{
- return "MB";
+ return B_TRANSLATE("MB");
}
@@ -872,12 +872,12 @@
CPUUsageDataSource::_SetCPU(int32 cpu)
{
fCPU = cpu;
- fLabel = "CPU";
+ fLabel = B_TRANSLATE("CPU");
if (SystemInfo().CPUCount() > 1)
fLabel << " " << cpu + 1;
-
fShortLabel = fLabel;
- fLabel << " usage";
+
+ fLabel << " " << B_TRANSLATE("usage");
const rgb_color kColors[B_MAX_CPU_COUNT] = {
// TODO: find some better defaults...
@@ -1045,7 +1045,8 @@
PageFaultsDataSource::Print(BString& text, int64 value) const
{
char buffer[32];
- snprintf(buffer, sizeof(buffer), "%.1f faults/s", value / 1024.0);
+ snprintf(buffer, sizeof(buffer), B_TRANSLATE("%.1f faults/s"),
+ value / 1024.0);
text = buffer;
}
@@ -1146,7 +1147,7 @@
NetworkUsageDataSource::Print(BString& text, int64 value) const
{
char buffer[32];
- snprintf(buffer, sizeof(buffer), "%.1f KB/s", value / 1024.0);
+ snprintf(buffer, sizeof(buffer), B_TRANSLATE("%.1f KB/s"), value /
1024.0);
text = buffer;
}
@@ -1177,7 +1178,8 @@
const char*
NetworkUsageDataSource::ShortLabel() const
{
- return fIn ? B_TRANSLATE("RX") : B_TRANSLATE("TX");
+ return fIn ? B_TRANSLATE_COMMENT("RX", "Shorter version for
Receiving.") :
+ B_TRANSLATE_COMMENT("TX", "Shorter version for Sending");
}
Modified: haiku/trunk/src/apps/expander/ExpanderWindow.cpp
===================================================================
--- haiku/trunk/src/apps/expander/ExpanderWindow.cpp 2011-02-11 18:13:21 UTC
(rev 40440)
+++ haiku/trunk/src/apps/expander/ExpanderWindow.cpp 2011-02-11 19:20:11 UTC
(rev 40441)
@@ -585,8 +585,8 @@
BEntry entry(&fSourceRef);
BPath path(&entry);
- BString text(B_TRANSLATE("Expanding file "));
- text.Append(path.Leaf());
+ BString text(B_TRANSLATE("Expanding '%s'"));
+ text.ReplaceFirst("%s", path.Leaf());
fStatusView->SetText(text.String());
fExpandingThread = new ExpanderThread(&message, new BMessenger(this));
Modified: haiku/trunk/src/apps/icon-o-matic/Jamfile
===================================================================
--- haiku/trunk/src/apps/icon-o-matic/Jamfile 2011-02-11 18:13:21 UTC (rev
40440)
+++ haiku/trunk/src/apps/icon-o-matic/Jamfile 2011-02-11 19:20:11 UTC (rev
40441)
@@ -356,4 +356,5 @@
SetGradientCommand.cpp
ResetTransformationCommand.cpp
TransformBoxStates.cpp
+ TransformerFactory.cpp
;
Modified: haiku/trunk/src/apps/icon-o-matic/gui/PathListView.cpp
===================================================================
--- haiku/trunk/src/apps/icon-o-matic/gui/PathListView.cpp 2011-02-11
18:13:21 UTC (rev 40440)
+++ haiku/trunk/src/apps/icon-o-matic/gui/PathListView.cpp 2011-02-11
19:20:11 UTC (rev 40441)
@@ -749,9 +749,9 @@
new BMessage(MSG_REVERSE));
fCleanUpMI = new BMenuItem(B_TRANSLATE("Clean up"),
new BMessage(MSG_CLEAN_UP));
- fRotateIndicesRightMI = new BMenuItem(B_TRANSLATE("Rotate indices
right"),
+ fRotateIndicesRightMI = new BMenuItem(B_TRANSLATE("Rotate indices
forwards"),
new BMessage(MSG_ROTATE_INDICES_CCW), 'R');
- fRotateIndicesLeftMI = new BMenuItem(B_TRANSLATE("Rotate indices left"),
+ fRotateIndicesLeftMI = new BMenuItem(B_TRANSLATE("Rotate indices
backwards"),
new BMessage(MSG_ROTATE_INDICES_CW), 'R', B_SHIFT_KEY);
fRemoveMI = new BMenuItem(B_TRANSLATE("Remove"),
new BMessage(MSG_REMOVE));
@@ -769,8 +769,8 @@
fMenu->AddSeparatorItem();
+ fMenu->AddItem(fRotateIndicesRightMI);
fMenu->AddItem(fRotateIndicesLeftMI);
- fMenu->AddItem(fRotateIndicesRightMI);
fMenu->AddSeparatorItem();
Modified: haiku/trunk/src/apps/text_search/GrepWindow.cpp
===================================================================
--- haiku/trunk/src/apps/text_search/GrepWindow.cpp 2011-02-11 18:13:21 UTC
(rev 40440)
+++ haiku/trunk/src/apps/text_search/GrepWindow.cpp 2011-02-11 19:20:11 UTC
(rev 40441)
@@ -797,6 +797,11 @@
fButton->MakeFocus(true);
fButton->SetLabel(B_TRANSLATE("Cancel"));
+ fButton->ResizeToPreferred();
+ fButton->MoveTo(
+ fMenuBar->Frame().Width() - fButton->Frame().Width() -
8,
+ 8 + fSearchText->Frame().Height() + 8);
+
fSearch->SetEnabled(false);
// We need to remember the search pattern, because during
@@ -847,6 +852,11 @@
fEncodingMenu->SetEnabled(true);
fButton->SetLabel(B_TRANSLATE("Search"));
+ fButton->ResizeToPreferred();
+ fButton->MoveTo(
+ fMenuBar->Frame().Width() - fButton->Frame().Width() - 8,
+ 8 + fSearchText->Frame().Height() + 8);
+
fButton->SetEnabled(true);
fSearch->SetEnabled(true);
Modified: haiku/trunk/src/preferences/filetypes/Jamfile
===================================================================
--- haiku/trunk/src/preferences/filetypes/Jamfile 2011-02-11 18:13:21 UTC
(rev 40440)
+++ haiku/trunk/src/preferences/filetypes/Jamfile 2011-02-11 19:20:11 UTC
(rev 40441)
@@ -33,6 +33,7 @@
x-vnd.Haiku-FileTypes
:
ApplicationTypeWindow.cpp
+ ApplicationTypesWindow.cpp
AttributeWindow.cpp
ExtensionWindow.cpp
FileTypes.cpp
Other related posts:
- » [haiku-commits] r40441 - in haiku/trunk/src: apps/activitymonitor apps/expander apps/icon-o-matic apps/icon-o-matic/gui apps/text_search ... - humdingerb
