[haiku-commits] haiku: hrev47983 - src/apps/poorman
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 8 Oct 2014 13:37:54 +0200 (CEST)
hrev47983 adds 1 changeset to branch 'master'
old head: be93029899fb6fc32eabbaa0647f4716d03737f0
new head: 0e7fcd84af6c2bae5d5a741f3eb8f59813e0a6e0
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=0e7fcd8+%5Ebe93029
----------------------------------------------------------------------------
0e7fcd8: PoorMan: use BMessageFormat.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev47983
Commit: 0e7fcd84af6c2bae5d5a741f3eb8f59813e0a6e0
URL: http://cgit.haiku-os.org/haiku/commit/?id=0e7fcd8
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Wed Oct 8 11:38:32 2014 UTC
----------------------------------------------------------------------------
4 files changed, 14 insertions(+), 15 deletions(-)
src/apps/poorman/StatusSlider.cpp | 15 +++++++--------
src/apps/poorman/StatusSlider.h | 8 ++++----
src/apps/poorman/constants.cpp | 4 ++--
src/apps/poorman/constants.h | 2 +-
----------------------------------------------------------------------------
diff --git a/src/apps/poorman/StatusSlider.cpp
b/src/apps/poorman/StatusSlider.cpp
index 9c39ea4..551b2f3 100644
--- a/src/apps/poorman/StatusSlider.cpp
+++ b/src/apps/poorman/StatusSlider.cpp
@@ -8,22 +8,21 @@
#include "StatusSlider.h"
-#include <stdio.h>
+#include <MessageFormat.h>
StatusSlider::StatusSlider(const char* name, const char* label,
- char* statusPrefix, BMessage* message, int32 minValue, int32 maxValue)
+ const char* statusPrefix, BMessage* message, int32 minValue, int32
maxValue)
:
- BSlider(name, label, message, minValue, maxValue, B_HORIZONTAL),
+ BSlider(name, label, message, minValue, maxValue, B_HORIZONTAL),
fStatusPrefix(statusPrefix)
{
- fTemp = fStr;
}
-
+
+
const char*
StatusSlider::UpdateText() const
{
- sprintf(fTemp, "%" B_PRId32 " %s", Value(), fStatusPrefix);
-
- return fTemp;
+ BMessageFormat().Format(fStr, fStatusPrefix, Value());
+ return fStr.String();
}
diff --git a/src/apps/poorman/StatusSlider.h b/src/apps/poorman/StatusSlider.h
index e7d0d27..1236ee7 100644
--- a/src/apps/poorman/StatusSlider.h
+++ b/src/apps/poorman/StatusSlider.h
@@ -11,13 +11,14 @@
//#define BEOS_R5_COMPATIBLE
#include <Slider.h>
+#include <String.h>
class StatusSlider: public BSlider {
public:
StatusSlider(const
char* name,
const char*
label,
- char*
statusPrefix,
+ const char*
statusPrefix,
BMessage*
message,
int32 minValue,
int32 maxValue);
@@ -25,9 +26,8 @@ public:
virtual const char* UpdateText() const;
private:
- char* fStatusPrefix;
- char* fTemp;
- char fStr[128];
+ const char* fStatusPrefix;
+ mutable BString fStr;
};
#endif
diff --git a/src/apps/poorman/constants.cpp b/src/apps/poorman/constants.cpp
index 2e97faa..f076e36 100644
--- a/src/apps/poorman/constants.cpp
+++ b/src/apps/poorman/constants.cpp
@@ -115,8 +115,8 @@ const char* STR_BBX_CONNECTION
= B_TRANSLATE("Connections");
const char* STR_SLD_LABEL
= B_TRANSLATE("Max. simultaneous connections:");
-char* STR_SLD_STATUS_LABEL
- = (char*)B_TRANSLATE("connections");
+const char* STR_SLD_STATUS_LABEL
+ = B_TRANSLATE("{0, plural, one{# connection} other{# connections}}");
const char CMD_FILE_SAVE_AS
= 'S';
diff --git a/src/apps/poorman/constants.h b/src/apps/poorman/constants.h
index 201e21b..a9d1b34 100644
--- a/src/apps/poorman/constants.h
+++ b/src/apps/poorman/constants.h
@@ -94,7 +94,7 @@ extern const char* STR_FILEPANEL_CREATE_LOG_FILE;
extern const char* STR_TAB_ADVANCED;
extern const char* STR_BBX_CONNECTION;
extern const char* STR_SLD_LABEL;
-extern char* STR_SLD_STATUS_LABEL;
+extern const char* STR_SLD_STATUS_LABEL;
extern const char CMD_FILE_SAVE_AS;
extern const char CMD_FILE_QUIT;
Other related posts:
- » [haiku-commits] haiku: hrev47983 - src/apps/poorman - pulkomandy
