[haiku-commits] haiku: hrev47583 - data/artwork/icons src/apps/webwatch
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 28 Jul 2014 13:28:29 +0200 (CEST)
hrev47583 adds 4 changesets to branch 'master'
old head: 410d94cf868ca358661927a3f34243402c5ce2d1
new head: 8b95dd25f979aea76f5cb1b72b8649fc9b903189
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=8b95dd2+%5E410d94c
----------------------------------------------------------------------------
b2bf8f4: webwatch: Style cleanup
002064c: webwatch: Use ui_color() for text
5bff096: Add an icon for WebWatch
A dumb mod form App_clock.
8b95dd2: webwatch: Add HVIF icon resource
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 33 insertions(+), 20 deletions(-)
data/artwork/icons/App_WebWatch | Bin 0 -> 14324 bytes
src/apps/webwatch/WatchApp.cpp | 4 ----
src/apps/webwatch/WatchView.cpp | 18 ++----------------
src/apps/webwatch/WebWatch.rdef | 31 +++++++++++++++++++++++++++++++
############################################################################
Commit: b2bf8f450414553872f2ba3ab8905ee927be68cf
URL: http://cgit.haiku-os.org/haiku/commit/?id=b2bf8f4
Author: François Revol <revol@xxxxxxx>
Date: Mon Jul 28 10:51:11 2014 UTC
webwatch: Style cleanup
----------------------------------------------------------------------------
diff --git a/src/apps/webwatch/WatchApp.cpp b/src/apps/webwatch/WatchApp.cpp
index 4aa508c..bcb4e82 100644
--- a/src/apps/webwatch/WatchApp.cpp
+++ b/src/apps/webwatch/WatchApp.cpp
@@ -26,14 +26,12 @@
#include "WatchApp.h"
#include "WatchView.h"
-///////////////////////////////////////////////////////////////////////////////
BView* instantiate_deskbar_item()
{
return new WatchView;
}
-///////////////////////////////////////////////////////////////////////////////
WatchApp::WatchApp() : BApplication(APP_SIGNATURE)
{
@@ -56,7 +54,6 @@ WatchApp::WatchApp() : BApplication(APP_SIGNATURE)
PostMessage(B_QUIT_REQUESTED);
}
-///////////////////////////////////////////////////////////////////////////////
int main()
{
@@ -65,4 +62,3 @@ int main()
return 0;
}
-///////////////////////////////////////////////////////////////////////////////
diff --git a/src/apps/webwatch/WatchView.cpp b/src/apps/webwatch/WatchView.cpp
index ad5f3b4..e2bda77 100644
--- a/src/apps/webwatch/WatchView.cpp
+++ b/src/apps/webwatch/WatchView.cpp
@@ -36,7 +36,6 @@
const rgb_color COLOR_FOREGROUND = { 0, 0, 0 };
-///////////////////////////////////////////////////////////////////////////////
WatchView::WatchView()
:
@@ -44,7 +43,6 @@ WatchView::WatchView()
{
}
-///////////////////////////////////////////////////////////////////////////////
WatchView::WatchView(BMessage* message)
: BView(
@@ -66,7 +64,6 @@ WatchView::WatchView(BMessage* message)
SetViewColor(B_TRANSPARENT_COLOR);
}
-///////////////////////////////////////////////////////////////////////////////
WatchView* WatchView::Instantiate(BMessage* archive)
{
@@ -78,7 +75,6 @@ WatchView* WatchView::Instantiate(BMessage* archive)
return NULL;
}
-///////////////////////////////////////////////////////////////////////////////
status_t WatchView::Archive(BMessage* archive, bool deep) const
{
@@ -90,7 +86,6 @@ status_t WatchView::Archive(BMessage* archive, bool deep)
const
return B_OK;
}
-///////////////////////////////////////////////////////////////////////////////
void WatchView::Draw(BRect updateRect)
{
@@ -116,7 +111,6 @@ void WatchView::Draw(BRect updateRect)
DrawString(string, BPoint(x, y));
}
-///////////////////////////////////////////////////////////////////////////////
void WatchView::MouseDown(BPoint point)
{
@@ -137,7 +131,6 @@ void WatchView::MouseDown(BPoint point)
delete menu;
}
-///////////////////////////////////////////////////////////////////////////////
void WatchView::MessageReceived(BMessage* msg)
{
@@ -149,7 +142,6 @@ void WatchView::MessageReceived(BMessage* msg)
}
}
-///////////////////////////////////////////////////////////////////////////////
void WatchView::OnAboutRequested()
{
@@ -164,7 +156,6 @@ void WatchView::OnAboutRequested()
alert->Go(NULL);
}
-///////////////////////////////////////////////////////////////////////////////
void WatchView::OnQuitRequested()
{
@@ -177,7 +168,6 @@ void WatchView::OnQuitRequested()
deskbar.RemoveItem(DESKBAR_ITEM_NAME);
}
-///////////////////////////////////////////////////////////////////////////////
void WatchView::Pulse()
{
@@ -189,7 +179,6 @@ void WatchView::Pulse()
}
}
-///////////////////////////////////////////////////////////////////////////////
int32 WatchView::GetInternetTime()
{
@@ -202,4 +191,3 @@ int32 WatchView::GetInternetTime()
return (int32) (((real_time_clock() + 3600) % 86400) / 86.4);
}
-///////////////////////////////////////////////////////////////////////////////
############################################################################
Commit: 002064caf3160e41bbe06d6c6ff0f9b60c32e1a5
URL: http://cgit.haiku-os.org/haiku/commit/?id=002064c
Author: François Revol <revol@xxxxxxx>
Date: Mon Jul 28 11:00:03 2014 UTC
webwatch: Use ui_color() for text
----------------------------------------------------------------------------
diff --git a/src/apps/webwatch/WatchView.cpp b/src/apps/webwatch/WatchView.cpp
index e2bda77..b0ab5bf 100644
--- a/src/apps/webwatch/WatchView.cpp
+++ b/src/apps/webwatch/WatchView.cpp
@@ -22,6 +22,7 @@
#include <Alert.h>
#include <Deskbar.h>
+#include <InterfaceDefs.h>
#include <MenuItem.h>
#include <PopUpMenu.h>
#include <String.h>
@@ -34,9 +35,6 @@
#define B_TRANSLATION_CONTEXT "WatchView"
-const rgb_color COLOR_FOREGROUND = { 0, 0, 0 };
-
-
WatchView::WatchView()
:
BView(BRect(0, 0, 1, 1), 0, 0, 0)
@@ -106,7 +104,7 @@ void WatchView::Draw(BRect updateRect)
FillRect(updateRect);
SetLowColor(Parent()->ViewColor());
- SetHighColor(COLOR_FOREGROUND);
+ SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR));
SetDrawingMode(B_OP_OVER);
DrawString(string, BPoint(x, y));
}
############################################################################
Commit: 5bff096de091986fe9a69303c3076c5e78e7584e
URL: http://cgit.haiku-os.org/haiku/commit/?id=5bff096
Author: François Revol <revol@xxxxxxx>
Date: Mon Jul 28 11:06:39 2014 UTC
Add an icon for WebWatch
A dumb mod form App_clock.
----------------------------------------------------------------------------
diff --git a/data/artwork/icons/App_WebWatch b/data/artwork/icons/App_WebWatch
new file mode 100644
index 0000000..959cbfe
Binary files /dev/null and b/data/artwork/icons/App_WebWatch differ
############################################################################
Revision: hrev47583
Commit: 8b95dd25f979aea76f5cb1b72b8649fc9b903189
URL: http://cgit.haiku-os.org/haiku/commit/?id=8b95dd2
Author: François Revol <revol@xxxxxxx>
Date: Mon Jul 28 11:12:31 2014 UTC
webwatch: Add HVIF icon resource
----------------------------------------------------------------------------
diff --git a/src/apps/webwatch/WebWatch.rdef b/src/apps/webwatch/WebWatch.rdef
index 155df6f..7b2af81 100644
--- a/src/apps/webwatch/WebWatch.rdef
+++ b/src/apps/webwatch/WebWatch.rdef
@@ -17,3 +17,34 @@ resource app_version {
resource app_flags B_SINGLE_LAUNCH | B_BACKGROUND_APP;
+resource vector_icon {
+ $"6E636966080500040071020006043D88273D8827BED4133ED4134B1000C6104F"
+ $"4104A3A585B3FEFFE1026667FF037072020006033B9EE13B9EE1BB9EE13B9EE1"
+ $"47C3854A3E7A009BEFF03FFFFFFFFF04A8AA020006033C63923CAF4CBEFCFD3E"
+ $"A8B54B019A4657497C40C5C70030A3A5FF28A3A5020106023C60000000000000"
+ $"003CE0004940004A100000F8F8FFFF9898FF0200160236921535A80EBE517B3F"
+ $"427A4A81C644E5E400DAFF0005FF0E0604EB5E5264555E52524C486050605060"
+ $"5660060EFEEFFF07C6A7C82FC6A7C82FC6A7C82FC6D3C7F9525352C7AF525352"
+ $"40524052BB93C08D26C482B75FBE11B425BA33B55C36242E28B6D0B7F2B6D0B7"
+ $"F2B6D0B7F2B5EBB8C3B565BBC226BA0FB565BBC2B565C354B565C354B565C46D"
+ $"B764C651B649C5C4B764C651C1C0CB82C1C0CB82C27DCBE0C37ACB5FC321CBCB"
+ $"C37ACB5FCB5F060AFE6F06C6A7C82FC6A7C82FC6A7C82FC6D3C7F9525352C7AF"
+ $"52535240524052BB93C08D26C482B75FBE11B425BA33B55C36242E28B6D0B7F2"
+ $"B7F2C37ACB5FCB5F0607FE3F382C382C382CC046B9A3C3B446C353BE25C3B2BD"
+ $"F7BD5D2AC151B8F7BD5D2A3A2A3A2ABAAFB5A4B71FB7B2B85AB606B86FB6BD38"
+ $"2CBA62B6B0382C0208382C382CB89AB5CCB565BBC226B793B565BBC2B565C354"
+ $"B565C354B565C46DB764C651B649C5C4B764C651C1C0CB82C1C0CB82C2D9CC0E"
+ $"C3BF5BC3BECB9DC3BF5BC3BF48C3BF484ABEC3BC912CC085B9C3BC912C020438"
+ $"30B97AB7D4BFA4BAEA464646BED746C572BC924EBFA5C6DEB97EC3C92ABC8E2A"
+ $"BFDB2AB94102043832BF33BB7EB9EBB8D9B7C9BCF42CBA18B7C9BFD1BC924CB9"
+ $"EDC335BF36C5DAC15B45C15AC49B44BEE2020730BE8C30BE8C30BC21BD5D37BB"
+ $"28BB0FBE33BC95BF9FBE10BEFABD41BEE2BCBDBC9134BDC9BB95BA5DB9DDB896"
+ $"BD5AB895BAEFB896BEDABA51C1D4B945C084B9BBC0C7B962BE8CB961BF9FB962"
+ $"BE8C02053DBDBC3DBDBCBDFEBD74BD8ABE3EBD89BDAFBD8ABECEBE90BFC5BDFF"
+ $"BF7DBF20C00DBF94BF43BF94BFD2BF93BEB3BE90BDBCBF1EBE04BE90BDBC0802"
+ $"403440360802404A404C08024A404C400802344036400407EE2F41423F3EC091"
+ $"BE32BE22BFB53C454541C190C215C1DDBEC6403946393B393848BB1CC0853B4D"
+ $"4647090A010100000A0001011001178400040A020102000A040104000A030103"
+ $"000A000105000A050106000A07020708000A06050D0C0B0A09123EFE743DD3DA"
+ $"3559283F4C7FBECFC1C690AD0117832204"
+};
Other related posts:
- » [haiku-commits] haiku: hrev47583 - data/artwork/icons src/apps/webwatch - revol
