[Pkg-wmaker-commits] [wmforecast] 01/11: wmforecast.c: Add new colors to preferences GUI (revised).

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository wmforecast.

commit 8158d7b62342ddcf9954f0d83adffd888c92c73d
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Sun Sep 20 12:18:02 2015 -0400

    wmforecast.c: Add new colors to preferences GUI (revised).
---
 wmforecast.c | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/wmforecast.c b/wmforecast.c
index 37d0c9f..e610811 100755
--- a/wmforecast.c
+++ b/wmforecast.c
@@ -73,6 +73,7 @@ typedef struct {
 	long int minutesLeft;
 	Preferences *prefs;
 	PreferencesWindow *prefsWindow;
+	WMFrame *frame;
 	WMLabel *icon;
 	WMLabel *text;
 	WMScreen *screen;
@@ -256,7 +257,6 @@ Dockapp *newDockapp(WMScreen *screen, Preferences *prefs, int argc, char **argv)
 	Dockapp *dockapp = wmalloc(sizeof(Dockapp));
 	WMColor *background;
 	WMColor *text;
-	WMFrame *frame;
 	WMWindow *window;
 
 	dockapp->screen = screen;
@@ -277,13 +277,13 @@ Dockapp *newDockapp(WMScreen *screen, Preferences *prefs, int argc, char **argv)
 		prefs->text = DEFAULT_TEXT_COLOR;
 	}
 
-	frame = WMCreateFrame(window);
-	WMSetFrameRelief(frame,WRSunken);
-	WMResizeWidget(frame,56,56);
-	WMSetWidgetBackgroundColor(frame, background);
-	WMRealizeWidget(frame);
+	dockapp->frame = WMCreateFrame(window);
+	WMSetFrameRelief(dockapp->frame,WRSunken);
+	WMResizeWidget(dockapp->frame,56,56);
+	WMSetWidgetBackgroundColor(dockapp->frame, background);
+	WMRealizeWidget(dockapp->frame);
 
-	dockapp->text = WMCreateLabel(frame);
+	dockapp->text = WMCreateLabel(dockapp->frame);
 	WMSetWidgetBackgroundColor(dockapp->text, background);
 	WMSetLabelFont(dockapp->text, WMCreateFont(screen, "-Misc-Fixed-Medium-R-SemiCondensed--13-120-75-75-C-60-ISO10646-1"));
 	WMSetLabelTextColor(dockapp->text, text);
@@ -292,7 +292,7 @@ Dockapp *newDockapp(WMScreen *screen, Preferences *prefs, int argc, char **argv)
 	WMMoveWidget(dockapp->text,2,40);
 	WMRealizeWidget(dockapp->text);
 
-	dockapp->icon = WMCreateLabel(frame);
+	dockapp->icon = WMCreateLabel(dockapp->frame);
 	WMSetWidgetBackgroundColor(dockapp->icon, background);
 	WMRealizeWidget(dockapp->icon);
 	WMSetLabelImagePosition(dockapp->icon,WIPImageOnly);
@@ -300,8 +300,8 @@ Dockapp *newDockapp(WMScreen *screen, Preferences *prefs, int argc, char **argv)
 	WMMoveWidget(dockapp->icon,12,5);
 
 	WMMapWidget(window);
-	WMMapWidget(frame);
-	WMMapSubwidgets(frame);
+	WMMapWidget(dockapp->frame);
+	WMMapSubwidgets(dockapp->frame);
 
 	return dockapp;
 }
@@ -480,15 +480,24 @@ Weather *getWeather(WMScreen *screen, Preferences *prefs)
 static void updateDockapp(void *data)
 {
 	Dockapp *dockapp = (Dockapp *)data;
-
+	WMColor *background;
+	WMColor *text;
 	WMScreen *screen = dockapp->screen;
 	Preferences *prefs = dockapp->prefs;
 	Weather *weather;
 	WMPixmap *icon;
 
+	background = WMCreateNamedColor(screen, prefs->background, True);
+	text = WMCreateNamedColor(screen, prefs->text, True);
+
 	WMSetLabelText(dockapp->text,"loading");
+	WMSetWidgetBackgroundColor(dockapp->text, background);
+	WMSetLabelTextColor(dockapp->text, text);
 	WMRedisplayWidget(dockapp->text);
 
+	WMSetWidgetBackgroundColor(dockapp->frame, background);
+	WMSetWidgetBackgroundColor(dockapp->icon, background);
+
 	weather = getWeather(screen, prefs);
 
 	if (weather->errorFlag) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmforecast.git