[Goodies-commits] r2243 - in xfce4-weather-plugin/trunk: . icons/liquid panel-plugin po
Nick Schermer
nick at xfce.org
Sun Dec 17 16:15:01 CET 2006
Author: nick
Date: 2006-12-17 15:15:01 +0000 (Sun, 17 Dec 2006)
New Revision: 2243
Added:
xfce4-weather-plugin/trunk/icons/liquid/0.png
xfce4-weather-plugin/trunk/icons/liquid/99.png
Modified:
xfce4-weather-plugin/trunk/ChangeLog
xfce4-weather-plugin/trunk/README
xfce4-weather-plugin/trunk/TODO
xfce4-weather-plugin/trunk/icons/liquid/25.png
xfce4-weather-plugin/trunk/icons/liquid/36.png
xfce4-weather-plugin/trunk/icons/liquid/Makefile.am
xfce4-weather-plugin/trunk/panel-plugin/weather-config.c
xfce4-weather-plugin/trunk/panel-plugin/weather-config.h
xfce4-weather-plugin/trunk/panel-plugin/weather-data.c
xfce4-weather-plugin/trunk/panel-plugin/weather-data.h
xfce4-weather-plugin/trunk/panel-plugin/weather-http.c
xfce4-weather-plugin/trunk/panel-plugin/weather-http.h
xfce4-weather-plugin/trunk/panel-plugin/weather-icon.c
xfce4-weather-plugin/trunk/panel-plugin/weather-icon.h
xfce4-weather-plugin/trunk/panel-plugin/weather-parsers.c
xfce4-weather-plugin/trunk/panel-plugin/weather-parsers.h
xfce4-weather-plugin/trunk/panel-plugin/weather-scrollbox.c
xfce4-weather-plugin/trunk/panel-plugin/weather-scrollbox.h
xfce4-weather-plugin/trunk/panel-plugin/weather-search.c
xfce4-weather-plugin/trunk/panel-plugin/weather-search.h
xfce4-weather-plugin/trunk/panel-plugin/weather-summary.c
xfce4-weather-plugin/trunk/panel-plugin/weather-summary.h
xfce4-weather-plugin/trunk/panel-plugin/weather-translate.c
xfce4-weather-plugin/trunk/panel-plugin/weather-translate.h
xfce4-weather-plugin/trunk/panel-plugin/weather.c
xfce4-weather-plugin/trunk/panel-plugin/weather.h
xfce4-weather-plugin/trunk/po/ChangeLog
xfce4-weather-plugin/trunk/po/POTFILES.in
xfce4-weather-plugin/trunk/po/ca.po
xfce4-weather-plugin/trunk/po/cs.po
xfce4-weather-plugin/trunk/po/de.po
xfce4-weather-plugin/trunk/po/eu.po
xfce4-weather-plugin/trunk/po/fi.po
xfce4-weather-plugin/trunk/po/fr.po
xfce4-weather-plugin/trunk/po/gl.po
xfce4-weather-plugin/trunk/po/hu.po
xfce4-weather-plugin/trunk/po/lt.po
xfce4-weather-plugin/trunk/po/nl.po
xfce4-weather-plugin/trunk/po/sk.po
xfce4-weather-plugin/trunk/po/xfce4-weather-plugin.pot
xfce4-weather-plugin/trunk/po/zh_TW.po
Log:
Code layout improved, applied patch from Peggy Kutyla
Modified: xfce4-weather-plugin/trunk/ChangeLog
===================================================================
--- xfce4-weather-plugin/trunk/ChangeLog 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/ChangeLog 2006-12-17 15:15:01 UTC (rev 2243)
@@ -1,3 +1,7 @@
+2006-12-17 16:11 nick
+ * Cleaned up the code
+ * Applied patch from Peggy Kutyla (Bug 2656)
+
2006-09-06 11:00 nick
* Addded $Id$'s using svn:keyword
Modified: xfce4-weather-plugin/trunk/README
===================================================================
--- xfce4-weather-plugin/trunk/README 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/README 2006-12-17 15:15:01 UTC (rev 2243)
@@ -0,0 +1,2 @@
+XML information:
+http://www.weather.com/documentation/xml/weather.dtd
\ No newline at end of file
Modified: xfce4-weather-plugin/trunk/TODO
===================================================================
--- xfce4-weather-plugin/trunk/TODO 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/TODO 2006-12-17 15:15:01 UTC (rev 2243)
@@ -0,0 +1,2 @@
+* Use the Xfce hvbox
+* Fix plugin when resuming from suspend
\ No newline at end of file
Added: xfce4-weather-plugin/trunk/icons/liquid/0.png
===================================================================
(Binary files differ)
Property changes on: xfce4-weather-plugin/trunk/icons/liquid/0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: xfce4-weather-plugin/trunk/icons/liquid/25.png
===================================================================
(Binary files differ)
Modified: xfce4-weather-plugin/trunk/icons/liquid/36.png
===================================================================
(Binary files differ)
Added: xfce4-weather-plugin/trunk/icons/liquid/99.png
===================================================================
(Binary files differ)
Property changes on: xfce4-weather-plugin/trunk/icons/liquid/99.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: xfce4-weather-plugin/trunk/icons/liquid/Makefile.am
===================================================================
--- xfce4-weather-plugin/trunk/icons/liquid/Makefile.am 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/icons/liquid/Makefile.am 2006-12-17 15:15:01 UTC (rev 2243)
@@ -1,6 +1,7 @@
liquiddir = $(datadir)/xfce4/weather/icons/liquid
-liquid_DATA = 1.png \
+liquid_DATA = 0.png \
+ 1.png \
2.png \
3.png \
4.png \
@@ -46,7 +47,8 @@
44.png \
45.png \
46.png \
- 47.png
+ 47.png \
+ 99.png
EXTRA_DIST = \
$(liquid_DATA)
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-config.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-config.c 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-config.c 2006-12-17 15:15:01 UTC (rev 2243)
@@ -243,6 +243,8 @@
cb (data);
}
+
+
static int
option_i (datas opt)
{
@@ -257,6 +259,8 @@
return -1;
}
+
+
static gboolean
cb_findlocation (GtkButton *button,
gpointer user_data)
@@ -277,6 +281,7 @@
}
+
xfceweather_dialog *
create_config_dialog (xfceweather_data *data,
GtkWidget *vbox)
@@ -335,7 +340,8 @@
button = gtk_button_new ();
image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
- g_signal_connect (button, "clicked", G_CALLBACK (cb_findlocation), dialog);
+ g_signal_connect (G_OBJECT (button), "clicked",
+ G_CALLBACK (cb_findlocation), dialog);
hbox = gtk_hbox_new (FALSE, BORDER);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -375,20 +381,17 @@
gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0);
- g_signal_connect (dialog->chk_proxy_use, "toggled", G_CALLBACK (cb_toggle),
- (gpointer) dialog->txt_proxy_host);
- g_signal_connect (dialog->chk_proxy_use, "toggled", G_CALLBACK (cb_toggle),
- (gpointer) dialog->txt_proxy_port);
- g_signal_connect (dialog->chk_proxy_use, "toggled", G_CALLBACK (cb_toggle),
- (gpointer) dialog->chk_proxy_fromenv);
+ g_signal_connect (G_OBJECT (dialog->chk_proxy_use), "toggled",
+ G_CALLBACK (cb_toggle), dialog->txt_proxy_host);
+ g_signal_connect (G_OBJECT (dialog->chk_proxy_use), "toggled",
+ G_CALLBACK (cb_toggle), dialog->txt_proxy_port);
+ g_signal_connect (G_OBJECT (dialog->chk_proxy_use), "toggled",
+ G_CALLBACK (cb_toggle), dialog->chk_proxy_fromenv);
+ g_signal_connect (G_OBJECT (dialog->chk_proxy_fromenv), "toggled",
+ G_CALLBACK (cb_not_toggle), dialog->txt_proxy_host);
+ g_signal_connect (G_OBJECT (dialog->chk_proxy_fromenv), "toggled",
+ G_CALLBACK (cb_not_toggle), dialog->txt_proxy_port);
- g_signal_connect (dialog->chk_proxy_fromenv, "toggled",
- G_CALLBACK (cb_not_toggle),
- (gpointer) dialog->txt_proxy_host);
- g_signal_connect (dialog->chk_proxy_fromenv, "toggled",
- G_CALLBACK (cb_not_toggle),
- (gpointer) dialog->txt_proxy_port);
-
if (dialog->wd->saved_proxy_host != NULL)
{
gtk_entry_set_text (GTK_ENTRY (dialog->txt_proxy_host),
@@ -417,7 +420,6 @@
/* labels */
-
dialog->opt_xmloption = make_label ();
dialog->mdl_xmloption = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
dialog->lst_xmloption =
@@ -466,14 +468,18 @@
g_object_unref (G_OBJECT (sg));
g_object_unref (G_OBJECT (sg_buttons));
- g_signal_connect (button_add, "clicked", G_CALLBACK (cb_addoption), dialog);
- g_signal_connect (button_del, "clicked", G_CALLBACK (cb_deloption), dialog);
+ g_signal_connect (G_OBJECT (button_add), "clicked",
+ G_CALLBACK (cb_addoption), dialog);
+ g_signal_connect (G_OBJECT (button_del), "clicked",
+ G_CALLBACK (cb_deloption), dialog);
gtk_widget_show_all (vbox);
return dialog;
}
+
+
void
set_callback_config_dialog (xfceweather_dialog *dialog,
cb_function cb_new)
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-config.h
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-config.h 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-config.h 2006-12-17 15:15:01 UTC (rev 2243)
@@ -15,32 +15,34 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef CONFIG_DIALOG_H
-#define CONFIG_DIALOG_H
+#ifndef __WEATHER_CONFIG_H__
+#define __WEATHER_CONFIG_H__
-G_BEGIN_DECLS typedef struct
+G_BEGIN_DECLS
+
+typedef struct
{
gchar *name;
- datas number;
+ datas number;
}
labeloption;
typedef struct
{
- GtkWidget *dialog;
- GtkWidget *opt_unit;
- GtkWidget *txt_loc_code;
- GtkWidget *txt_proxy_host;
- GtkWidget *txt_proxy_port;
- GtkWidget *chk_proxy_use;
- GtkWidget *chk_proxy_fromenv;
+ GtkWidget *dialog;
+ GtkWidget *opt_unit;
+ GtkWidget *txt_loc_code;
+ GtkWidget *txt_proxy_host;
+ GtkWidget *txt_proxy_port;
+ GtkWidget *chk_proxy_use;
+ GtkWidget *chk_proxy_fromenv;
- GtkWidget *tooltip_yes;
- GtkWidget *tooltip_no;
+ GtkWidget *tooltip_yes;
+ GtkWidget *tooltip_no;
- GtkWidget *opt_xmloption;
- GtkWidget *lst_xmloption;
- GtkListStore *mdl_xmloption;
+ GtkWidget *opt_xmloption;
+ GtkWidget *lst_xmloption;
+ GtkListStore *mdl_xmloption;
xfceweather_data *wd;
}
@@ -56,4 +58,5 @@
void apply_options (xfceweather_dialog * dialog);
G_END_DECLS
+
#endif
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-data.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-data.c 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-data.c 2006-12-17 15:15:01 UTC (rev 2243)
@@ -32,14 +32,18 @@
#define EMPTY_STRING g_strdup("-")
#define CHK_NULL(str) str ? g_strdup(str) : EMPTY_STRING;
+
+
+
gchar *kill_ring[KILL_RING_S] = { NULL, };
-#define debug_print printf
+
+
static gchar *
copy_buffer (gchar *str)
{
- static gint p = 0;
- gchar *s;
+ static gint p = 0;
+ gchar *s;
if (!str)
{
@@ -60,6 +64,8 @@
return s;
}
+
+
void
free_get_data_buffer (void)
{
@@ -72,6 +78,8 @@
}
}
+
+
static gchar *
get_data_uv (xml_uv *data,
datas_uv type)
@@ -98,6 +106,7 @@
}
+
static gchar *
get_data_bar (xml_bar *data,
datas_bar type)
@@ -123,6 +132,8 @@
return CHK_NULL (str);
}
+
+
static gchar *
get_data_wind (xml_wind *data,
datas_wind type)
@@ -160,6 +171,8 @@
return CHK_NULL (str);
}
+
+
/* -- This is not the same as the previous functions */
static gchar *
get_data_cc (xml_cc *data,
@@ -223,6 +236,8 @@
return CHK_NULL (str);
}
+
+
static gchar *
get_data_loc (xml_loc *data,
datas_loc type)
@@ -252,6 +267,7 @@
}
+
const gchar *
get_data (xml_weather *data,
datas type)
@@ -283,6 +299,8 @@
return p;
}
+
+
static gchar *
get_data_part (xml_part *data,
forecast type)
@@ -316,6 +334,8 @@
return str;
}
+
+
const gchar *
get_data_f (xml_dayf *data,
forecast type)
@@ -362,6 +382,8 @@
return p;
}
+
+
const gchar *
get_unit (units unit,
datas type)
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-data.h
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-data.h 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-data.h 2006-12-17 15:15:01 UTC (rev 2243)
@@ -15,10 +15,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef GET_DATA_H
-#define GET_DATA_H
+#ifndef __WEATHER_DATA_H__
+#define __WEATHER_DATA_H__
-G_BEGIN_DECLS typedef enum
+G_BEGIN_DECLS
+
+typedef enum
{
_WIND_SPEED,
_WIND_GUST,
@@ -44,29 +46,23 @@
typedef enum
{
/* cc */
- LSUP = 0x0101,
- OBST = 0x0102,
- TRANS = 0x0103,
- UV_INDEX = 0x0105,
- UV_TRANS = 0x0106,
+ LSUP = 0x0101,
+ OBST = 0x0102,
+ TRANS = 0x0103,
+ UV_INDEX = 0x0105,
+ UV_TRANS = 0x0106,
WIND_DIRECTION = 0x0107,
- BAR_D = 0x0108,
- WIND_TRANS = 0x0109,
- WICON = 0x0110,
-
- FLIK = 0x0120,
- TEMP = 0x0121,
- DEWP = 0x0122,
-
- HMID = 0x0130,
-
- WIND_SPEED = 0x0140,
- WIND_GUST = 0x0141,
-
-
- BAR_R = 0x0150,
-
- VIS = 0x0160
+ BAR_D = 0x0108,
+ WIND_TRANS = 0x0109,
+ WICON = 0x0110,
+ FLIK = 0x0120,
+ TEMP = 0x0121,
+ DEWP = 0x0122,
+ HMID = 0x0130,
+ WIND_SPEED = 0x0140,
+ WIND_GUST = 0x0141,
+ BAR_R = 0x0150,
+ VIS = 0x0160
}
datas;
@@ -80,30 +76,27 @@
typedef enum
{
- ITEMS = 0x0100,
- WDAY = 0x0101,
- TEMP_MIN = 0x0102,
- TEMP_MAX = 0x0103,
-
- F_ICON = 0x0001,
- F_PPCP = 0x0002,
+ ITEMS = 0x0100,
+ WDAY = 0x0101,
+ TEMP_MIN = 0x0102,
+ TEMP_MAX = 0x0103,
+ F_ICON = 0x0001,
+ F_PPCP = 0x0002,
F_W_DIRECTION = 0x0003,
- F_W_SPEED = 0x0004,
- F_TRANS = 0x0005,
-
- NPART = 0x0200,
- ICON_N = 0x0201,
- PPCP_N = 0x0202,
+ F_W_SPEED = 0x0004,
+ F_TRANS = 0x0005,
+ NPART = 0x0200,
+ ICON_N = 0x0201,
+ PPCP_N = 0x0202,
W_DIRECTION_N = 0x0203,
- W_SPEED_N = 0x0204,
- TRANS_N = 0x0205,
-
- DPART = 0x0300,
- ICON_D = 0x0301,
- PPCP_D = 0x0302,
+ W_SPEED_N = 0x0204,
+ TRANS_N = 0x0205,
+ DPART = 0x0300,
+ ICON_D = 0x0301,
+ PPCP_D = 0x0302,
W_DIRECTION_D = 0x0303,
- W_SPEED_D = 0x0304,
- TRANS_D = 0x0305
+ W_SPEED_D = 0x0304,
+ TRANS_D = 0x0305
}
forecast;
@@ -123,4 +116,5 @@
void free_get_data_buffer (void);
G_END_DECLS
+
#endif
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-http.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-http.c 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-http.c 2006-12-17 15:15:01 UTC (rev 2243)
@@ -37,32 +37,36 @@
struct request_data
{
- int fd;
+ gint fd;
- FILE *save_fp;
- gchar *save_filename;
- gchar **save_buffer;
+ FILE *save_fp;
+ gchar *save_filename;
+ gchar **save_buffer;
- gboolean has_header;
- gchar last_chars[4];
+ gboolean has_header;
+ gchar last_chars[4];
- gchar *request_buffer;
- gint offset;
- gint size;
+ gchar *request_buffer;
+ gint offset;
+ gint size;
- CB_TYPE cb_function;
- gpointer cb_data;
+ CB_TYPE cb_function;
+ gpointer cb_data;
};
+
+
static gboolean keep_receiving (gpointer data);
-static int
-http_connect (gchar * hostname, gint port)
+
+static gint
+http_connect (gchar *hostname,
+ gint port)
{
- struct sockaddr_in dest_host;
- struct hostent *host_address;
- gint fd;
+ struct sockaddr_in dest_host;
+ struct hostent *host_address;
+ gint fd;
if ((host_address = gethostbyname (hostname)) == NULL)
return -1;
@@ -87,15 +91,14 @@
}
+
+
static void
request_free (struct request_data *request)
{
- if (request->request_buffer)
- g_free (request->request_buffer);
+ g_free (request->request_buffer);
+ g_free (request->save_filename);
- if (request->save_filename)
- g_free (request->save_filename);
-
if (request->save_fp)
fclose (request->save_fp);
@@ -105,9 +108,14 @@
panel_slice_free (struct request_data, request);
}
+
+
static void
-request_save (struct request_data *request, const gchar * buffer)
+request_save (struct request_data *request,
+ const gchar *buffer)
{
+ gchar *newbuff;
+
DBG ("Request Save");
if (request->save_filename)
@@ -123,7 +131,7 @@
{
if (*request->save_buffer)
{
- gchar *newbuff = g_strconcat (*request->save_buffer, buffer, NULL);
+ newbuff = g_strconcat (*request->save_buffer, buffer, NULL);
g_free (*request->save_buffer);
*request->save_buffer = newbuff;
}
@@ -132,11 +140,13 @@
}
}
+
+
static gboolean
keep_sending (gpointer data)
{
struct request_data *request = (struct request_data *) data;
- gint n;
+ gint n;
if (!request)
{
@@ -161,9 +171,6 @@
}
else if (errno != EAGAIN) /* some other error happened */
{
-#if DEBUG
- perror ("keep_sending()");
-#endif
DBG ("file desc: %d", request->fd);
@@ -174,14 +181,15 @@
return TRUE;
}
+
+
static gboolean
keep_receiving (gpointer data)
{
struct request_data *request = (struct request_data *) data;
- gchar recvbuffer[1024];
- gint n;
- gchar *p;
- gchar *str = NULL;
+ gchar recvbuffer[1024];
+ gint n;
+ gchar *p, *str = NULL;
if (!request)
{
@@ -222,11 +230,11 @@
else if (n == 0)
{
CB_TYPE callback = request->cb_function;
- gpointer data = request->cb_data;
+
DBG ("keep_receiving(): ending with succes");
request_free (request);
- callback (TRUE, data);
+ callback (TRUE, request->cb_data);
return FALSE;
}
else if (errno != EAGAIN)
@@ -243,20 +251,21 @@
static gboolean
-http_get (gchar * url,
- gchar * hostname,
- gboolean savefile,
- gchar ** fname_buff,
- gchar * proxy_host,
- gint proxy_port, CB_TYPE callback, gpointer data)
+http_get (gchar *url,
+ gchar *hostname,
+ gboolean savefile,
+ gchar **fname_buff,
+ gchar *proxy_host,
+ gint proxy_port,
+ CB_TYPE callback,
+ gpointer data)
{
struct request_data *request = panel_slice_new0 (struct request_data);
if (!request)
{
-#if DEBUG
- perror ("http_get(): empty request");
-#endif
+ DBG ("http_get(): empty request");
+
return FALSE;
}
@@ -292,9 +301,9 @@
if (request->request_buffer == NULL)
{
-#if DEBUG
- perror ("http_get(): empty request buffer\n");
-#endif
+
+ DBG ("http_get(): empty request buffer");
+
close (request->fd);
panel_slice_free (struct request_data, request);
return FALSE;
@@ -316,23 +325,31 @@
return TRUE;
}
+
+
gboolean
-http_get_file (gchar * url,
- gchar * hostname,
- gchar * filename,
- gchar * proxy_host,
- gint proxy_port, CB_TYPE callback, gpointer data)
+http_get_file (gchar *url,
+ gchar *hostname,
+ gchar *filename,
+ gchar *proxy_host,
+ gint proxy_port,
+ CB_TYPE callback,
+ gpointer data)
{
return http_get (url, hostname, TRUE, &filename, proxy_host, proxy_port,
callback, data);
}
+
+
gboolean
-http_get_buffer (gchar * url,
- gchar * hostname,
- gchar * proxy_host,
- gint proxy_port,
- gchar ** buffer, CB_TYPE callback, gpointer data)
+http_get_buffer (gchar *url,
+ gchar *hostname,
+ gchar *proxy_host,
+ gint proxy_port,
+ gchar **buffer,
+ CB_TYPE callback,
+ gpointer data)
{
return http_get (url, hostname, FALSE, buffer, proxy_host, proxy_port,
callback, data);
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-http.h
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-http.h 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-http.h 2006-12-17 15:15:01 UTC (rev 2243)
@@ -15,11 +15,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef HTTP_CLIENT_H
-#define HTTP_CLIENT_H
+#ifndef __WEATHER_HTTP_H__
+#define __WEATHER_HTTP_H__
-G_BEGIN_DECLS typedef void (*CB_TYPE) (gboolean, gpointer);
+G_BEGIN_DECLS
+typedef void (*CB_TYPE) (gboolean, gpointer);
+
gboolean
http_get_file (gchar * url, gchar * hostname,
gchar * filename, gchar * proxy_host, gint proxy_port,
@@ -31,4 +33,5 @@
CB_TYPE callback, gpointer data);
G_END_DECLS
+
#endif
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-icon.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-icon.c 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-icon.c 2006-12-17 15:15:01 UTC (rev 2243)
@@ -24,14 +24,19 @@
#include "weather-icon.h"
+
+
#define DEFAULT_W_THEME "liquid"
+
+
GdkPixbuf *
-get_icon (const gchar * number, GtkIconSize size)
+get_icon (const gchar *number,
+ GtkIconSize size)
{
GdkPixbuf *image = NULL;
- gchar *filename;
- gint width, height;
+ gchar *filename;
+ gint width, height;
gtk_icon_size_lookup (size, &width, &height);
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-icon.h
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-icon.h 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-icon.h 2006-12-17 15:15:01 UTC (rev 2243)
@@ -15,10 +15,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef ICON_H
-#define ICON_H
+#ifndef __WEATHER_ICON_H__
+#define __WEATHER_ICON_H__
-G_BEGIN_DECLS GdkPixbuf *get_icon (const gchar * icon, GtkIconSize size);
+G_BEGIN_DECLS
+GdkPixbuf *get_icon (const gchar * icon, GtkIconSize size);
+
G_END_DECLS
+
#endif
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-parsers.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-parsers.c 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-parsers.c 2006-12-17 15:15:01 UTC (rev 2243)
@@ -22,10 +22,14 @@
#include "weather-parsers.h"
#include <libxfce4panel/xfce-panel-macros.h>
+
+
xml_weather *
-parse_weather (xmlNode * cur_node)
+parse_weather (xmlNode *cur_node)
{
xml_weather *ret;
+ xmlNode *child_node;
+ guint i = 0;
if (!NODE_IS_TYPE (cur_node, "weather"))
{
@@ -46,9 +50,6 @@
ret->loc = parse_loc (cur_node);
else if (NODE_IS_TYPE (cur_node, "dayf"))
{
- xmlNode *child_node;
- guint i = 0;
-
for (child_node = cur_node->children; child_node;
child_node = child_node->next)
{
@@ -68,8 +69,10 @@
return ret;
}
+
+
xml_loc *
-parse_loc (xmlNode * cur_node)
+parse_loc (xmlNode *cur_node)
{
xml_loc *ret;
@@ -93,8 +96,10 @@
return ret;
}
+
+
static xml_uv *
-parse_uv (xmlNode * cur_node)
+parse_uv (xmlNode *cur_node)
{
xml_uv *ret;
@@ -115,8 +120,10 @@
return ret;
}
+
+
static xml_bar *
-parse_bar (xmlNode * cur_node)
+parse_bar (xmlNode *cur_node)
{
xml_bar *ret;
@@ -137,8 +144,10 @@
return ret;
}
+
+
static xml_wind *
-parse_wind (xmlNode * cur_node)
+parse_wind (xmlNode *cur_node)
{
xml_wind *ret;
@@ -163,8 +172,10 @@
return ret;
}
+
+
xml_cc *
-parse_cc (xmlNode * cur_node)
+parse_cc (xmlNode *cur_node)
{
xml_cc *ret;
@@ -205,8 +216,10 @@
return ret;
}
+
+
static xml_part *
-parse_part (xmlNode * cur_node)
+parse_part (xmlNode *cur_node)
{
xml_part *ret;
@@ -236,10 +249,10 @@
xml_dayf *
-parse_dayf (xmlNode * cur_node)
+parse_dayf (xmlNode *cur_node)
{
xml_dayf *ret;
- gchar *value;
+ gchar *value;
if ((ret = panel_slice_new0 (xml_dayf)) == NULL)
return NULL;
@@ -278,50 +291,55 @@
return ret;
}
-#define CHK_FREE(this) if (this)\
- g_free(this);
+
static void
xml_uv_free (xml_uv * data)
{
- CHK_FREE (data->i);
- CHK_FREE (data->t);
+ g_free (data->i);
+ g_free (data->t);
panel_slice_free (xml_uv, data);
}
+
+
static void
xml_wind_free (xml_wind * data)
{
- CHK_FREE (data->s);
- CHK_FREE (data->gust);
- CHK_FREE (data->d);
- CHK_FREE (data->t);
+ g_free (data->s);
+ g_free (data->gust);
+ g_free (data->d);
+ g_free (data->t);
panel_slice_free (xml_wind, data);
}
+
+
static void
xml_bar_free (xml_bar * data)
{
- CHK_FREE (data->r);
- CHK_FREE (data->d);
+ g_free (data->r);
+ g_free (data->d);
panel_slice_free (xml_bar, data);
}
+
+
static void
xml_cc_free (xml_cc * data)
{
- CHK_FREE (data->obst);
- CHK_FREE (data->lsup);
- CHK_FREE (data->flik);
- CHK_FREE (data->t);
- CHK_FREE (data->icon);
- CHK_FREE (data->tmp);
- CHK_FREE (data->hmid);
- CHK_FREE (data->vis);
- CHK_FREE (data->dewp);
+ g_free (data->obst);
+ g_free (data->lsup);
+ g_free (data->flik);
+ g_free (data->t);
+ g_free (data->icon);
+ g_free (data->tmp);
+ g_free (data->hmid);
+ g_free (data->vis);
+ g_free (data->dewp);
if (data->uv)
xml_uv_free (data->uv);
@@ -335,26 +353,30 @@
panel_slice_free (xml_cc, data);
}
+
+
static void
-xml_loc_free (xml_loc * data)
+xml_loc_free (xml_loc *data)
{
- CHK_FREE (data->dnam);
- CHK_FREE (data->sunr);
- CHK_FREE (data->suns);
+ g_free (data->dnam);
+ g_free (data->sunr);
+ g_free (data->suns);
panel_slice_free (xml_loc, data);
}
+
+
static void
-xml_part_free (xml_part * data)
+xml_part_free (xml_part *data)
{
if (!data)
return;
- CHK_FREE (data->icon);
- CHK_FREE (data->t);
- CHK_FREE (data->ppcp);
- CHK_FREE (data->hmid);
+ g_free (data->icon);
+ g_free (data->t);
+ g_free (data->ppcp);
+ g_free (data->hmid);
if (data->wind)
xml_wind_free (data->wind);
@@ -362,16 +384,18 @@
panel_slice_free (xml_part, data);
}
+
+
static void
-xml_dayf_free (xml_dayf * data)
+xml_dayf_free (xml_dayf *data)
{
if (!data)
return;
- CHK_FREE (data->day);
- CHK_FREE (data->date);
- CHK_FREE (data->hi);
- CHK_FREE (data->low);
+ g_free (data->day);
+ g_free (data->date);
+ g_free (data->hi);
+ g_free (data->low);
if (data->part[0])
xml_part_free (data->part[0]);
@@ -382,9 +406,13 @@
panel_slice_free (xml_dayf, data);
}
+
+
void
-xml_weather_free (xml_weather * data)
+xml_weather_free (xml_weather *data)
{
+ guint i;
+
if (data->cc)
xml_cc_free (data->cc);
@@ -393,7 +421,6 @@
if (data->dayf)
{
- guint i;
for (i = 0; i < XML_WEATHER_DAYF_N; i++)
{
if (!data->dayf[i])
@@ -401,7 +428,6 @@
xml_dayf_free (data->dayf[i]);
}
-
}
panel_slice_free (xml_weather, data);
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-parsers.h
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-parsers.h 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-parsers.h 2006-12-17 15:15:01 UTC (rev 2243)
@@ -15,8 +15,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef PARSERS_H
-#define PARSERS_H
+#ifndef __WEATHER_PARSERS_H__
+#define __WEATHER_PARSERS_H__
#include <glib.h>
#include <gtk/gtk.h>
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-scrollbox.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-scrollbox.c 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-scrollbox.c 2006-12-17 15:15:01 UTC (rev 2243)
@@ -27,33 +27,34 @@
#include "weather-scrollbox.h"
#define LABEL_REFRESH 3000
-#define LABEL_SPEED 25
+#define LABEL_SPEED 25
-typedef struct _Label Label;
-struct _Label
+
+typedef struct
{
- gchar *msg;
+ gchar *msg;
GdkPixmap *pixmap;
-};
+}
+Label;
enum
{
GTK_SCROLLBOX_ENABLECB = 1
};
-static GObjectClass *parent_class;
-static gboolean start_draw_down (GtkScrollbox * self);
-static void start_draw_up (GtkScrollbox * self);
+static GObjectClass *parent_class;
+static gboolean start_draw_down (GtkScrollbox * self);
+static void start_draw_up (GtkScrollbox * self);
+static void stop_callback (GtkScrollbox * self);
+static GdkPixmap *make_pixmap (GtkScrollbox *, gchar *);
-static void stop_callback (GtkScrollbox * self);
-static GdkPixmap *make_pixmap (GtkScrollbox *, gchar *);
static void
-free_label (Label * lbl)
+free_label (Label *lbl)
{
if (lbl->pixmap)
g_object_unref (G_OBJECT (lbl->pixmap));
@@ -63,12 +64,15 @@
panel_slice_free (Label, lbl);
}
+
+
static gboolean
-draw_up (GtkScrollbox * self)
+draw_up (GtkScrollbox *self)
{
- GdkRectangle update_rect = { 0, 0, GTK_WIDGET (self)->allocation.width,
- GTK_WIDGET (self)->allocation.height
- };
+ GdkRectangle update_rect = { 0, 0,
+ GTK_WIDGET (self)->allocation.width,
+ GTK_WIDGET (self)->allocation.height
+ };
if (self->draw_offset == 0)
{
@@ -86,12 +90,15 @@
return TRUE;
}
+
+
static gboolean
-draw_down (GtkScrollbox * self)
+draw_down (GtkScrollbox *self)
{
- GdkRectangle update_rect = { 0, 0, GTK_WIDGET (self)->allocation.width,
- GTK_WIDGET (self)->allocation.height
- };
+ GdkRectangle update_rect = { 0, 0,
+ GTK_WIDGET (self)->allocation.width,
+ GTK_WIDGET (self)->allocation.height
+ };
if (self->draw_offset == self->draw_maxoffset)
{
@@ -108,12 +115,18 @@
return TRUE;
}
+
+
static void
-start_draw_up (GtkScrollbox * self)
+start_draw_up (GtkScrollbox *self)
{
- gint width, height;
- Label *lbl;
- static size_t i = 0;
+ gint width, height;
+ Label *lbl;
+ static size_t i = 0;
+ GdkRectangle update_rect = { 0, 0,
+ GTK_WIDGET (self)->allocation.width,
+ GTK_WIDGET (self)->allocation.height
+ };
if (self->labels->len == 0)
return;
@@ -141,10 +154,6 @@
if (self->labels->len == 1)
{
- GdkRectangle update_rect = { 0, 0, GTK_WIDGET (self)->allocation.width,
- GTK_WIDGET (self)->allocation.height
- };
-
self->pixmap = lbl->pixmap;
self->draw_offset = 0;
@@ -161,8 +170,10 @@
i++;
}
+
+
static gboolean
-start_draw_down (GtkScrollbox * self)
+start_draw_down (GtkScrollbox *self)
{
self->draw_timeout =
g_timeout_add (LABEL_SPEED, (GSourceFunc) draw_down, self);
@@ -170,8 +181,10 @@
return FALSE;
}
+
+
static void
-stop_callback (GtkScrollbox * self)
+stop_callback (GtkScrollbox *self)
{
if (self->draw_timeout == 0)
return;
@@ -181,8 +194,9 @@
}
+
static void
-start_callback (GtkScrollbox * self)
+start_callback (GtkScrollbox *self)
{
if (self->draw_timeout)
stop_callback (self);
@@ -190,15 +204,18 @@
start_draw_up (self);
}
+
+
static GdkPixmap *
-make_pixmap (GtkScrollbox * self, gchar * value)
+make_pixmap (GtkScrollbox *self,
+ gchar *value)
{
- GdkWindow *rootwin;
- PangoLayout *pl;
- gint width, height, middle;
- GdkPixmap *pixmap;
- GtkRequisition widgsize = { 0, };
- GtkWidget *widget = (GtkWidget *) self;
+ GdkWindow *rootwin;
+ PangoLayout *pl;
+ gint width, height, middle;
+ GdkPixmap *pixmap;
+ GtkRequisition widgsize = { 0, };
+ GtkWidget *widget = (GtkWidget *) self;
/* If we can't draw yet, don't do anything to avoid screwing things */
@@ -244,18 +261,20 @@
void
-gtk_scrollbox_set_label (GtkScrollbox * self, gint n, gchar * value)
+gtk_scrollbox_set_label (GtkScrollbox *self,
+ gint n,
+ gchar *value)
{
- gboolean append = TRUE;
+ gboolean append = TRUE;
GdkPixmap *newpixmap;
- Label *newlbl;
+ Label *newlbl, *lbl;
if (n != -1)
append = FALSE;
if (!append)
{
- Label *lbl = (Label *) g_ptr_array_index (self->labels, n);
+ lbl = (Label *) g_ptr_array_index (self->labels, n);
if (lbl)
free_label (lbl);
@@ -274,18 +293,22 @@
newlbl->msg = g_strdup (value);
}
+
+
static void
-gtk_scrollbox_set_property (GObject * object,
- guint property_id,
- const GValue * value, GParamSpec * pspec)
+gtk_scrollbox_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
GtkScrollbox *self = (GtkScrollbox *) object;
+ gboolean realvalue;
switch (property_id)
{
case GTK_SCROLLBOX_ENABLECB:
{
- gboolean realvalue = g_value_get_boolean (value);
+ realvalue = g_value_get_boolean (value);
if (!realvalue && self->draw_timeout)
stop_callback (self);
@@ -302,19 +325,25 @@
}
}
+
+
static void
-gtk_scrollbox_get_property (GObject * object,
- guint property_id,
- GValue * value, GParamSpec * pspec)
+gtk_scrollbox_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
return;
}
+
+
static void
-gtk_scrollbox_finalize (GObject * gobject)
+gtk_scrollbox_finalize (GObject *gobject)
{
GtkScrollbox *self = (GtkScrollbox *) gobject;
- guint i;
+ guint i;
+ Label *lbl;
if (self->draw_timeout)
{
@@ -326,7 +355,7 @@
{
for (i = 0; i < self->labels->len; i++)
{
- Label *lbl = (Label *) g_ptr_array_index (self->labels, i);
+ lbl = (Label *) g_ptr_array_index (self->labels, i);
g_object_unref (G_OBJECT (lbl->pixmap));
g_free (lbl->msg);
@@ -337,11 +366,16 @@
G_OBJECT_CLASS (parent_class)->finalize (gobject);
}
+
+
static void
-redraw_labels (GtkWidget * widget, GtkStyle * previous_style)
+redraw_labels (GtkWidget *widget,
+ GtkStyle *previous_style)
{
GtkScrollbox *self = GTK_SCROLLBOX (widget);
- guint i;
+ guint i;
+ GdkPixmap *newpixmap;
+ Label *lbl;
if (self->labels->len < 1)
return;
@@ -354,8 +388,7 @@
for (i = 0; i < self->labels->len; i++)
{
- GdkPixmap *newpixmap;
- Label *lbl = (Label *) g_ptr_array_index (self->labels, i);
+ lbl = (Label *) g_ptr_array_index (self->labels, i);
if (!lbl->msg)
continue;
@@ -373,8 +406,10 @@
}
+
static void
-gtk_scrollbox_instance_init (GTypeInstance * instance, gpointer g_class)
+gtk_scrollbox_instance_init (GTypeInstance *instance,
+ gpointer g_class)
{
GtkScrollbox *self = (GtkScrollbox *) instance;
@@ -384,11 +419,15 @@
self->labels = g_ptr_array_new ();
self->pixmap = NULL;
- g_signal_connect (self, "style-set", G_CALLBACK (redraw_labels), NULL);
+ g_signal_connect (G_OBJECT (self), "style-set",
+ G_CALLBACK (redraw_labels), NULL);
}
+
+
static gboolean
-gtk_scrollbox_expose (GtkWidget * widget, GdkEventExpose * event)
+gtk_scrollbox_expose (GtkWidget *widget,
+ GdkEventExpose *event)
{
GtkScrollbox *self = (GtkScrollbox *) widget;
@@ -403,8 +442,11 @@
return FALSE;
}
+
+
void
-gtk_scrollbox_enablecb (GtkScrollbox * self, gboolean enable)
+gtk_scrollbox_enablecb (GtkScrollbox *self,
+ gboolean enable)
{
GValue val = { 0, };
@@ -414,23 +456,27 @@
g_object_set_property (G_OBJECT (self), "enablecb", &val);
}
+
+
GtkWidget *
gtk_scrollbox_new (void)
{
return GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLBOX, NULL));
}
+
+
static void
-gtk_scrollbox_class_init (gpointer g_class, gpointer g_class_data)
+gtk_scrollbox_class_init (gpointer g_class,
+ gpointer g_class_data)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (g_class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (g_class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (g_class);
+ GParamSpec *scrollbox_param_spec;
parent_class = g_type_class_peek_parent (g_class);
- GParamSpec *scrollbox_param_spec;
-
gobject_class->set_property = gtk_scrollbox_set_property;
gobject_class->get_property = gtk_scrollbox_get_property;
@@ -447,6 +493,7 @@
}
+
GType
gtk_scrollbox_get_type (void)
{
@@ -459,12 +506,12 @@
sizeof (GtkScrollboxClass),
NULL, /* base_init */
NULL, /* base_finalize */
- gtk_scrollbox_class_init, /* class_init */
+ gtk_scrollbox_class_init, /* class_init */
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkScrollbox),
- 0, /* n_preallocs */
- gtk_scrollbox_instance_init, /* instance_init */
+ 0, /* n_preallocs */
+ gtk_scrollbox_instance_init, /* instance_init */
NULL
};
@@ -475,14 +522,18 @@
return type;
}
+
+
void
-gtk_scrollbox_clear (GtkScrollbox * self)
+gtk_scrollbox_clear (GtkScrollbox *self)
{
+ Label *lbl;
+
stop_callback (self);
while (self->labels->len > 0)
{
- Label *lbl = (Label *) g_ptr_array_index (self->labels, 0);
+ lbl = (Label *) g_ptr_array_index (self->labels, 0);
free_label (lbl);
g_ptr_array_remove_index (self->labels, 0);
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-scrollbox.h
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-scrollbox.h 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-scrollbox.h 2006-12-17 15:15:01 UTC (rev 2243)
@@ -15,11 +15,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef SCROLLBOX_H
-#define SCROLLBOX_H
+#ifndef __WEATHER_SCROLLBOX_H__
+#define __WEATHER_SCROLLBOX_H__
-G_BEGIN_DECLS GType gtk_scrollbox_get_type (void);
+G_BEGIN_DECLS
+GType gtk_scrollbox_get_type (void);
+
#define GTK_TYPE_SCROLLBOX (gtk_scrollbox_get_type())
#define GTK_SCROLLBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_SCROLLBOX, GtkScrollbox))
#define GTK_SCROLLBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_SCROLLBOX, GtkScrollboxClass))
@@ -32,17 +34,17 @@
struct _GtkScrollbox
{
- GtkDrawingArea parent;
+ GtkDrawingArea parent;
- GPtrArray *labels;
+ GPtrArray *labels;
- gint draw_offset;
- gint draw_maxoffset;
- gint draw_middle;
- gint draw_maxmiddle;
- gint draw_timeout;
+ gint draw_offset;
+ gint draw_maxoffset;
+ gint draw_middle;
+ gint draw_maxmiddle;
+ gint draw_timeout;
- GdkPixmap *pixmap;
+ GdkPixmap *pixmap;
};
struct _GtkScrollboxClass
@@ -59,4 +61,5 @@
void gtk_scrollbox_clear (GtkScrollbox * self);
G_END_DECLS
+
#endif
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-search.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-search.c 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-search.c 2006-12-17 15:15:01 UTC (rev 2243)
@@ -30,8 +30,12 @@
#define BORDER 8
+
+
static void
-append_result (GtkListStore * mdl, gchar * id, gchar * city)
+append_result (GtkListStore *mdl,
+ gchar *id,
+ gchar *city)
{
GtkTreeIter iter;
@@ -39,11 +43,13 @@
gtk_list_store_set (mdl, &iter, 0, city, 1, id, -1);
}
+
+
static gchar *
-sanitize_str (const gchar * str)
+sanitize_str (const gchar *str)
{
GString *retstr = g_string_sized_new (strlen (str));
- gchar *realstr, c = '\0';
+ gchar *realstr, c = '\0';
while ((c = *str++))
{
@@ -62,17 +68,19 @@
g_string_free (retstr, FALSE);
-
-
return realstr;
}
+
+
static void
-cb_searchdone (gboolean result, gpointer user_data)
+cb_searchdone (gboolean result,
+ gpointer user_data)
{
search_dialog *dialog = (search_dialog *) user_data;
- xmlDoc *doc;
- xmlNode *cur_node;
+ xmlDoc *doc;
+ xmlNode *cur_node;
+ gchar *id, *city;
if (!result || dialog->recv_buffer == NULL)
return;
@@ -92,9 +100,7 @@
{
if (NODE_IS_TYPE (cur_node, "loc"))
{
- gchar *id =
- (gchar *) xmlGetProp (cur_node, (const xmlChar *) "id");
- gchar *city;
+ id = (gchar *) xmlGetProp (cur_node, (const xmlChar *) "id");
if (!id)
continue;
@@ -106,6 +112,7 @@
g_free (id);
continue;
}
+
append_result (dialog->result_mdl, id, city);
g_free (id);
g_free (city);
@@ -119,13 +126,15 @@
}
+
static gboolean
-search_cb (GtkButton * button, gpointer user_data)
+search_cb (GtkButton *button,
+ gpointer user_data)
{
search_dialog *dialog = (search_dialog *) user_data;
- gchar *sane_str, *url;
- const gchar *str;
- gboolean result;
+ gchar *sane_str, *url;
+ const gchar *str;
+ gboolean result;
str = gtk_entry_get_text (GTK_ENTRY (dialog->search_entry));
@@ -150,13 +159,16 @@
}
+
search_dialog *
-create_search_dialog (GtkWindow * parent, gchar * proxy_host, gint proxy_port)
+create_search_dialog (GtkWindow *parent,
+ gchar *proxy_host,
+ gint proxy_port)
{
- GtkWidget *vbox, *label, *button, *hbox, *scroll, *frame;
+ GtkWidget *vbox, *label, *button, *hbox, *scroll, *frame;
GtkTreeViewColumn *column;
- GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
- search_dialog *dialog;
+ GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+ search_dialog *dialog;
dialog = panel_slice_new0 (search_dialog);
@@ -211,27 +223,31 @@
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
- g_signal_connect (button, "clicked", G_CALLBACK (search_cb), dialog);
+ g_signal_connect (G_OBJECT (button), "clicked",
+ G_CALLBACK (search_cb), dialog);
gtk_widget_set_size_request (dialog->dialog, 350, 250);
return dialog;
}
+
+
gboolean
-run_search_dialog (search_dialog * dialog)
+run_search_dialog (search_dialog *dialog)
{
+ GtkTreeIter iter;
+ GtkTreeSelection *selection;
+ GValue value = { 0, };
+
gtk_widget_show_all (dialog->dialog);
+
if (gtk_dialog_run (GTK_DIALOG (dialog->dialog)) == GTK_RESPONSE_ACCEPT)
{
- GtkTreeIter iter;
- GtkTreeSelection *selection =
- gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->result_list));
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->result_list));
if (gtk_tree_selection_get_selected (selection, NULL, &iter))
{
- GValue value = { 0, };
-
gtk_tree_model_get_value (GTK_TREE_MODEL (dialog->result_mdl),
&iter, 1, &value);
dialog->result = g_strdup (g_value_get_string (&value));
@@ -244,10 +260,13 @@
return FALSE;
}
+
+
void
free_search_dialog (search_dialog * dialog)
{
g_free (dialog->result);
+
gtk_widget_destroy (dialog->dialog);
panel_slice_free (search_dialog, dialog);
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-search.h
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-search.h 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-search.h 2006-12-17 15:15:01 UTC (rev 2243)
@@ -19,22 +19,24 @@
#include <gmodule.h>
#include <gtk/gtk.h>
-#ifndef SEARCH_DIALOG_H
-#define SEARCH_DIALOG_H
+#ifndef __WEATHER_SEARCH_H__
+#define __WEATHER_SEARCH_H__
-G_BEGIN_DECLS typedef struct
+G_BEGIN_DECLS
+
+typedef struct
{
- GtkWidget *dialog;
- GtkWidget *search_entry;
- GtkWidget *result_list;
+ GtkWidget *dialog;
+ GtkWidget *search_entry;
+ GtkWidget *result_list;
GtkListStore *result_mdl;
- gchar *result;
+ gchar *result;
- gchar *proxy_host;
- gint proxy_port;
+ gchar *proxy_host;
+ gint proxy_port;
- gchar *recv_buffer;
+ gchar *recv_buffer;
}
search_dialog;
@@ -45,4 +47,5 @@
void free_search_dialog (search_dialog * dialog);
G_END_DECLS
+
#endif
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-summary.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-summary.c 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-summary.c 2006-12-17 15:15:01 UTC (rev 2243)
@@ -29,27 +29,35 @@
#include "weather-translate.h"
#include "weather-icon.h"
-#define BORDER 8
-#define APPEND_BTEXT(text) gtk_text_buffer_insert_with_tags(GTK_TEXT_BUFFER(buffer),\
- &iter, text, -1, btag, NULL);
-#define APPEND_TEXT_ITEM_REAL(text) gtk_text_buffer_insert(GTK_TEXT_BUFFER(buffer), &iter, text, -1);
+#define BORDER 8
+#define APPEND_BTEXT(text) gtk_text_buffer_insert_with_tags(GTK_TEXT_BUFFER(buffer),\
+ &iter, text, -1, btag, NULL);
+#define APPEND_TEXT_ITEM_REAL(text) gtk_text_buffer_insert(GTK_TEXT_BUFFER(buffer), \
+ &iter, text, -1);\
+ g_free (value);
+#define APPEND_TEXT_ITEM(text, item) value = g_strdup_printf("\t%s: %s %s\n",\
+ text,\
+ get_data(data, item),\
+ get_unit(unit, item));\
+ APPEND_TEXT_ITEM_REAL(value);
-#define APPEND_TEXT_ITEM(text, item) value = g_strdup_printf("\t%s: %s %s\n",\
- text, get_data(data, item), get_unit(unit, item));\
- APPEND_TEXT_ITEM_REAL(value); g_free(value);
+
static GtkTooltips *tooltips = NULL;
+
+
static GtkWidget *
-create_summary_tab (xml_weather * data, units unit)
+create_summary_tab (xml_weather *data,
+ units unit)
{
GtkTextBuffer *buffer;
- GtkTextIter iter;
- GtkTextTag *btag;
- gchar *value, *date, *wind, *sun_val, *vis;
- GtkWidget *view, *frame, *scrolled;
+ GtkTextIter iter;
+ GtkTextTag *btag;
+ gchar *value, *date, *wind, *sun_val, *vis;
+ GtkWidget *view, *frame, *scrolled;
view = gtk_text_view_new ();
gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
@@ -70,115 +78,96 @@
gtk_text_buffer_create_tag (buffer, NULL, "weight", PANGO_WEIGHT_BOLD,
NULL);
-
- value =
- g_strdup_printf (_("Weather report for: %s.\n\n"), get_data (data, DNAM));
+ /* head */
+ value = g_strdup_printf (_("Weather report for: %s.\n\n"), get_data (data, DNAM));
APPEND_BTEXT (value);
g_free (value);
date = translate_lsup (get_data (data, LSUP));
- value =
- g_strdup_printf (_
- ("Observation station located in %s\nLast update: %s.\n"),
- get_data (data, OBST), date ? date : get_data (data,
- LSUP));
+ value = g_strdup_printf (_("Observation station located in %s\nLast update: %s.\n"),
+ get_data (data, OBST), date ? date : get_data (data, LSUP));
+ g_free (date);
APPEND_TEXT_ITEM_REAL (value);
- if (date)
- g_free (date);
-
- g_free (value);
-
+ /* Temperature */
APPEND_BTEXT (_("\nTemperature\n"));
APPEND_TEXT_ITEM (_("Temperature"), TEMP);
APPEND_TEXT_ITEM (_("Windchill"), FLIK);
/* special case for TRANS because of translate_desc */
- value = g_strdup_printf ("\t%s: %s\n",
- _("Description"),
+ value = g_strdup_printf ("\t%s: %s\n", _("Description"),
translate_desc (get_data (data, TRANS)));
APPEND_TEXT_ITEM_REAL (value);
- g_free (value);
-
APPEND_TEXT_ITEM (_("Dew point"), DEWP);
+ /* Wind */
APPEND_BTEXT (_("\nWind\n"));
wind = translate_wind_speed (get_data (data, WIND_SPEED), unit);
value = g_strdup_printf ("\t%s: %s\n", _("Speed"), wind);
- APPEND_TEXT_ITEM_REAL (value);
g_free (wind);
- g_free (value);
+ APPEND_TEXT_ITEM_REAL (value);
wind = translate_wind_direction (get_data (data, WIND_DIRECTION));
- value = g_strdup_printf ("\t%s: %s\n",
- _("Direction"), wind ? wind : get_data (data,
- WIND_DIRECTION));
- if (wind)
- g_free (wind);
+ value = g_strdup_printf ("\t%s: %s\n", _("Direction"),
+ wind ? wind : get_data (data, WIND_DIRECTION));
+ g_free (wind);
APPEND_TEXT_ITEM_REAL (value);
- g_free (value);
wind = translate_wind_speed (get_data (data, WIND_GUST), unit);
value = g_strdup_printf ("\t%s: %s\n", _("Gusts"), wind);
- APPEND_TEXT_ITEM_REAL (value);
g_free (wind);
- g_free (value);
+ APPEND_TEXT_ITEM_REAL (value);
+ /* UV */
APPEND_BTEXT (_("\nUV\n"));
APPEND_TEXT_ITEM (_("Index"), UV_INDEX);
- value = g_strdup_printf ("\t%s: %s\n",
- _("Risk"),
+ value = g_strdup_printf ("\t%s: %s\n", _("Risk"),
translate_risk (get_data (data, UV_TRANS)));
APPEND_TEXT_ITEM_REAL (value);
- g_free (value);
+ /* Atmospheric pressure */
APPEND_BTEXT (_("\nAtmospheric pressure\n"));
APPEND_TEXT_ITEM (_("Pressure"), BAR_R);
- value = g_strdup_printf ("\t%s: %s\n",
- _("State"),
+ value = g_strdup_printf ("\t%s: %s\n", _("State"),
translate_bard (get_data (data, BAR_D)));
APPEND_TEXT_ITEM_REAL (value);
- g_free (value);
+ /* Sun */
APPEND_BTEXT (_("\nSun\n"));
-
sun_val = translate_time (get_data (data, SUNR));
value = g_strdup_printf ("\t%s: %s\n",
- _("Rise"), sun_val ? sun_val : get_data (data,
- SUNR));
- if (sun_val)
- g_free (sun_val);
+ _("Rise"), sun_val ? sun_val : get_data (data, SUNR));
+ g_free (sun_val);
APPEND_TEXT_ITEM_REAL (value);
- g_free (value);
sun_val = translate_time (get_data (data, SUNS));
value = g_strdup_printf ("\t%s: %s\n",
- _("Set"), sun_val ? sun_val : get_data (data,
- SUNS));
- if (sun_val)
- g_free (sun_val);
+ _("Set"), sun_val ? sun_val : get_data (data, SUNS));
+ g_free (sun_val);
APPEND_TEXT_ITEM_REAL (value);
- g_free (value);
+ /* Other */
APPEND_BTEXT (_("\nOther\n"));
APPEND_TEXT_ITEM (_("Humidity"), HMID);
vis = translate_visibility (get_data (data, VIS), unit);
value = g_strdup_printf ("\t%s: %s\n", _("Visibility"), vis);
- APPEND_TEXT_ITEM_REAL (value);
g_free (vis);
- g_free (value);
+ APPEND_TEXT_ITEM_REAL (value);
return frame;
}
+
+
static GtkWidget *
-make_forecast (xml_dayf * weatherdata, units unit)
+make_forecast (xml_dayf *weatherdata,
+ units unit)
{
- GtkWidget *item_vbox, *temp_hbox, *icon_hbox, *label, *icon_d, *icon_n,
- *box_d, *box_n;
+ GtkWidget *item_vbox, *temp_hbox, *icon_hbox,
+ *label, *icon_d, *icon_n, *box_d, *box_n;
GdkPixbuf *icon;
- gchar *str, *day, *wind;
+ gchar *str, *day, *wind;
DBG ("this day %s", weatherdata->day);
@@ -190,13 +179,12 @@
gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
day = translate_day (get_data_f (weatherdata, WDAY));
+ str = g_strdup_printf ("<b>%s</b>", day ? day : get_data_f (weatherdata, WDAY));
+ g_free (day);
- str =
- g_strdup_printf ("<b>%s</b>", day ? day : get_data_f (weatherdata, WDAY));
- if (day)
- g_free (day);
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
+
gtk_box_pack_start (GTK_BOX (item_vbox), label, FALSE, FALSE, 0);
icon_hbox = gtk_hbox_new (FALSE, 0);
@@ -216,14 +204,13 @@
if (G_UNLIKELY (!tooltips))
tooltips = gtk_tooltips_new ();
- str =
- g_strdup_printf (_("Day: %s"),
- translate_desc (get_data_f (weatherdata, TRANS_D)));
+ str = g_strdup_printf (_("Day: %s"),
+ translate_desc (get_data_f (weatherdata, TRANS_D)));
gtk_tooltips_set_tip (tooltips, box_d, str, NULL);
g_free (str);
- str =
- g_strdup_printf (_("Night: %s"),
- translate_desc (get_data_f (weatherdata, TRANS_N)));
+
+ str = g_strdup_printf (_("Night: %s"),
+ translate_desc (get_data_f (weatherdata, TRANS_N)));
gtk_tooltips_set_tip (tooltips, box_n, str, NULL);
g_free (str);
@@ -243,21 +230,21 @@
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
gtk_box_pack_start (GTK_BOX (temp_hbox), label, TRUE, TRUE, 0);
+
label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
str = g_strdup_printf ("%s %%", get_data_f (weatherdata, PPCP_N));
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
+
gtk_box_pack_start (GTK_BOX (temp_hbox), label, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (item_vbox), temp_hbox, FALSE, FALSE, 0);
-
label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
gtk_label_set_markup (GTK_LABEL (label), _("<b>Temperature</b>"));
gtk_box_pack_start (GTK_BOX (item_vbox), label, FALSE, FALSE, 0);
-
temp_hbox = gtk_hbox_new (FALSE, 0);
label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
@@ -277,7 +264,6 @@
gtk_box_pack_start (GTK_BOX (temp_hbox), label, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (item_vbox), temp_hbox, FALSE, FALSE, 0);
-
label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
gtk_label_set_markup (GTK_LABEL (label), _("<b>Wind</b>"));
@@ -291,8 +277,7 @@
gtk_label_set_markup (GTK_LABEL (label),
wind ? wind : get_data_f (weatherdata,
W_DIRECTION_D));
- if (wind)
- g_free (wind);
+ g_free (wind);
gtk_box_pack_start (GTK_BOX (temp_hbox), label, TRUE, TRUE, 0);
@@ -303,13 +288,12 @@
gtk_label_set_markup (GTK_LABEL (label),
wind ? wind : get_data_f (weatherdata,
W_DIRECTION_N));
- if (wind)
- g_free (wind);
+ g_free (wind);
+
gtk_box_pack_start (GTK_BOX (temp_hbox), label, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (item_vbox), temp_hbox, FALSE, FALSE, 0);
/* speed */
-
temp_hbox = gtk_hbox_new (FALSE, 2);
label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
@@ -333,11 +317,14 @@
return item_vbox;
}
+
+
static GtkWidget *
-create_forecast_tab (xml_weather * data, units unit)
+create_forecast_tab (xml_weather *data,
+ units unit)
{
GtkWidget *widg = gtk_hbox_new (FALSE, 0);
- guint i;
+ guint i;
gtk_container_set_border_width (GTK_CONTAINER (widg), 6);
@@ -366,11 +353,14 @@
return widg;
}
+
+
GtkWidget *
-create_summary_window (xml_weather * data, units unit)
+create_summary_window (xml_weather *data,
+ units unit)
{
GtkWidget *window, *notebook, *vbox;
- gchar *title;
+ gchar *title;
GdkPixbuf *icon;
window = xfce_titled_dialog_new_with_buttons (_("Weather Update"),
@@ -379,8 +369,7 @@
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT, NULL);
- title =
- g_strdup_printf (_("Weather report for: %s"), get_data (data, DNAM));
+ title = g_strdup_printf (_("Weather report for: %s"), get_data (data, DNAM));
xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (window), title);
g_free (title);
@@ -392,7 +381,7 @@
icon = get_icon (get_data (data, WICON), GTK_ICON_SIZE_DIALOG);
if (!icon)
- icon = get_icon ("25", GTK_ICON_SIZE_DIALOG);
+ icon = get_icon ("99", GTK_ICON_SIZE_DIALOG);
gtk_window_set_icon (GTK_WINDOW (window), icon);
g_object_unref (G_OBJECT (icon));
@@ -408,7 +397,7 @@
gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
- g_signal_connect (window, "response",
+ g_signal_connect (G_OBJECT (window), "response",
G_CALLBACK (gtk_widget_destroy), window);
gtk_window_set_default_size (GTK_WINDOW (window), 500, 400);
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-summary.h
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-summary.h 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-summary.h 2006-12-17 15:15:01 UTC (rev 2243)
@@ -15,11 +15,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef SUMMARY_WINDOW_H
-#define SUMMARY_WINDOW_H
+#ifndef __WEATHER_SUMMARY_H__
+#define __WEATHER_SUMMARY_H__
G_BEGIN_DECLS
- GtkWidget * create_summary_window (xml_weather * data, units unit);
+GtkWidget * create_summary_window (xml_weather * data, units unit);
+
G_END_DECLS
#endif
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-translate.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-translate.c 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-translate.c 2006-12-17 15:15:01 UTC (rev 2243)
@@ -28,8 +28,24 @@
#include "weather-translate.h"
+
+#define HDATE_N (sizeof(gchar) * 100)
+#define DAY_LOC_N (sizeof(gchar) * 20)
+#define TIME_LOC_N (sizeof(gchar) * 20)
+
+
+
static const gchar *desc_strings[] = {
- N_("Snow to Rain"),
+ N_("AM Clouds / PM Sun"),
+ N_("AM Light Rain"),
+ N_("AM Light Snow"),
+ N_("AM Rain / Snow Showers"),
+ N_("AM Rain / Wind"),
+ N_("AM Showers"),
+ N_("AM Showers / Wind"),
+ N_("AM Snow Showers"),
+ N_("AM Snow Showers / Wind"),
+ N_("AM T-Storms"),
N_("Becoming Cloudy"),
N_("Blizzard"),
N_("Blizzard Conditions"),
@@ -43,88 +59,123 @@
N_("Clear"),
N_("Clearing"),
N_("Clouds"),
+ N_("Clouds Early / Clearing Late"),
N_("Cloudy"),
+ N_("Cloudy / Wind"),
N_("Cloudy Periods"),
N_("Continued Hot"),
N_("Cumulonimbus Clouds Observed"),
N_("Drifting Snow"),
+ N_("Drifting Snow and Windy"),
N_("Drizzle"),
N_("Dry"),
+ N_("Dust"),
N_("Fair"),
- N_("Flurries"),
+ N_("Few Showers"),
+ N_("Few Snow Showers"),
N_("Fog"),
N_("Freezing Drizzle"),
N_("Freezing Rain"),
N_("Freezing Rain/Snow"),
+ N_("Frigid"),
N_("Frozen Precip"),
+ N_("Hail"),
+ N_("Haze"),
N_("Hazy"),
N_("Heavy Rain"),
N_("Heavy Snow"),
N_("Hot And Humid"),
+ N_("Hot!"),
N_("Ice Crystals"),
N_("Ice/Snow Mixture"),
N_("Increasing Clouds"),
N_("Isolated Showers"),
+ N_("Isolated T-Storms"),
+ N_("Light Drizzle"),
+ N_("Light Drizzle and Windy"),
N_("Light Rain"),
+ N_("Light Rain / Wind"),
+ N_("Light rain late"),
+ N_("Light Rain Shower"),
N_("Light Snow"),
N_("Lightning Observed"),
- N_("mild and breezy"),
+ N_("Mild and Breezy"),
N_("Mist"),
N_("Mostly Clear"),
N_("Mostly Cloudy"),
+ N_("Mostly Cloudy / Wind"),
+ N_("Mostly Cloudy and Windy"),
N_("Mostly Sunny"),
- N_("N/A"),
+ N_("Mostly Sunny / Wind"),
+ N_("N/A Not Available"),
N_("Occasional Sunshine"),
N_("Overcast"),
N_("Partial Clearing"),
+ N_("Partial Fog"),
N_("Partial Sunshine"),
N_("Partly Cloudy"),
+ N_("Partly Cloudy / Wind"),
+ N_("Partly Cloudy and Windy"),
N_("Partly Sunny"),
+ N_("PM Light Rain"),
+ N_("PM Light Snow"),
+ N_("PM Rain / Wind"),
+ N_("PM Showers"),
+ N_("PM Snow Showers"),
+ N_("PM T-Storms"),
N_("Rain"),
+ N_("Rain / Snow"),
+ N_("Rain / Snow / Wind"),
+ N_("Rain / Snow Late"),
+ N_("Rain / Snow Showers"),
+ N_("Rain / Thunder"),
+ N_("Rain / Wind"),
+ N_("Rain and Sleet"),
N_("Rain and Snow"),
N_("Rain or Snow"),
- N_("Rain Showers"),
- N_("Rain to Snow"),
- N_("Rain / Snow Showers"),
+ N_("Rain Shower"),
+ N_("Rain Shower and Windy"),
+ N_("Rain to snow"),
+ N_("Rain/Lightning"),
+ N_("Scattered Showers"),
+ N_("Scattered Snow Showers"),
+ N_("Scattered Snow Showers / Wind"),
+ N_("Scattered T-Storms"),
N_("Showers"),
- N_("Sleet"),
+ N_("Showers / Wind"),
+ N_("Showers Early"),
+ N_("Showers in the Vicinity"),
+ N_("Showers in the Vincinity"),
+ N_("Showers Late"),
N_("Sleet and Snow"),
N_("Smoke"),
N_("Snow"),
N_("Snow and Rain"),
N_("Snow or Rain"),
- N_("Snow Showers"),
+ N_("Snow Shower"),
+ N_("Snow Shower / Wind"),
+ N_("Snow Showers Early"),
+ N_("Snow Showers early"),
+ N_("Snow Showers Late"),
+ N_("Snow to Rain"),
N_("Sunny"),
+ N_("Sunny / Wind"),
+ N_("T-Showers"),
+ N_("T-Storm"),
+ N_("T-Storms / Wind"),
+ N_("T-Storms Early"),
N_("Thunder"),
- N_("Thunder storms"),
+ N_("Thunder in the Vincinity"),
N_("Variable Cloudiness"),
N_("Variable Clouds"),
- N_("Windy"),
+ N_("Windy/Rain"),
+ N_("Windy/Snow"),
N_("Wintry Mix"),
- N_("Showers in the Vicinity"),
- N_("Light Rain Shower"),
- N_("Showers Late"),
- N_("PM Showers"),
- N_("Light Rain / Wind"),
- N_("Scattered Showers"),
- N_("PM Light Rain"),
- N_("AM Showers"),
- N_("AM Light Rain"),
- N_("Partly Cloudy and Windy"),
- N_("Few Showers"),
- N_("Light Drizzle"),
- N_("Clouds Early / Clearing Late"),
- N_("Mostly Cloudy and Windy"),
- N_("Rain / Snow"),
- N_("Rain and Sleet"),
- N_("Snow Showers Late"),
- N_("Light Drizzle and Windy"),
- N_("Snow Shower"),
- N_("Snow Showers Early"),
- N_("Few Snow Showers"),
NULL
};
+
+
static const gchar *bard_strings[] = {
N_("rising"),
N_("steady"),
@@ -132,6 +183,8 @@
NULL
};
+
+
static const gchar *risk_strings[] = {
N_("Low"),
N_("Moderate"),
@@ -141,6 +194,8 @@
NULL
};
+
+
static const gchar *wdirs[] = {
N_("S"),
N_("SSW"),
@@ -161,10 +216,13 @@
NULL
};
+
+
static const gchar *
-translate_str (const gchar ** loc_strings, const gchar * str)
+translate_str (const gchar **loc_strings,
+ const gchar *str)
{
- gint loc_string_len, str_len;
+ gint loc_string_len, str_len;
guint i;
if (str == NULL)
@@ -192,28 +250,38 @@
return str;
}
+
+
const gchar *
-translate_bard (const gchar * bard)
+translate_bard (const gchar *bard)
{
return translate_str (bard_strings, bard);
}
+
+
const gchar *
-translate_risk (const gchar * risk)
+translate_risk (const gchar *risk)
{
return translate_str (risk_strings, risk);
}
+
+
const gchar *
-translate_desc (const gchar * desc)
+translate_desc (const gchar *desc)
{
return translate_str (desc_strings, desc);
}
+
+
/* used by translate_lsup and translate_time */
static void
-_fill_time (struct tm *time,
- const gchar * hour, const gchar * minute, const gchar * am)
+_fill_time (struct tm *time,
+ const gchar *hour,
+ const gchar *minute,
+ const gchar *am)
{
time->tm_hour = atoi (hour);
@@ -227,17 +295,14 @@
-#define HDATE_N sizeof(gchar) * 100
gchar *
-translate_lsup (const gchar * lsup)
+translate_lsup (const gchar *lsup)
{
- gchar *hdate;
- struct tm time;
- gint size = 0, i = 0;
+ gchar *hdate;
+ struct tm time;
+ gint size = 0, i = 0;
+ gchar **lsup_split;
-
- gchar **lsup_split;
-
if (lsup == NULL || strlen (lsup) == 0)
return NULL;
@@ -274,16 +339,16 @@
return NULL;
}
-#define DAY_LOC_N sizeof(gchar) * 20
+
+
gchar *
-translate_day (const gchar * day)
+translate_day (const gchar *day)
{
- gint wday = -1;
- guint i;
- const gchar *days[] = {
- "su", "mo", "tu", "we", "th", "fr", "sa", NULL
- };
- gchar *day_loc;
+ gint wday = -1;
+ struct tm time;
+ guint i;
+ const gchar *days[] = {"su", "mo", "tu", "we", "th", "fr", "sa", NULL};
+ gchar *day_loc;
if (day == NULL || strlen (day) < 2)
return NULL;
@@ -296,8 +361,6 @@
return NULL;
else
{
- struct tm time;
-
time.tm_wday = wday;
day_loc = g_malloc (DAY_LOC_N);
@@ -308,13 +371,16 @@
}
}
+
+
/* NNW VAR */
gchar *
-translate_wind_direction (const gchar * wdir)
+translate_wind_direction (const gchar *wdir)
{
- gint wdir_len;
- guint i;
- gchar *wdir_loc;
+ gint wdir_len;
+ guint i;
+ gchar *wdir_loc, *tmp;
+ gchar wdir_i[2];
if (wdir == NULL || (wdir_len = strlen (wdir)) < 1)
return NULL;
@@ -335,9 +401,6 @@
wdir_loc = g_strdup ("");
for (i = 0; i < strlen (wdir); i++)
{
- gchar wdir_i[2];
- gchar *tmp;
-
wdir_i[0] = wdir[i];
wdir_i[1] = '\0';
@@ -352,9 +415,12 @@
return wdir_loc;
}
+
+
/* calm or a number */
gchar *
-translate_wind_speed (const gchar * wspeed, units unit)
+translate_wind_speed (const gchar *wspeed,
+ units unit)
{
gchar *wspeed_loc;
@@ -369,14 +435,14 @@
return wspeed_loc;
}
-/* 8:13 AM */
-#define TIME_LOC_N sizeof(gchar) * 20
+
+
gchar *
-translate_time (const gchar * time)
+translate_time (const gchar *time)
{
- gchar **time_split, *time_loc;
- int i = 0, size = 0;
- struct tm time_tm;
+ gchar **time_split, *time_loc;
+ gint i = 0, size = 0;
+ struct tm time_tm;
if (strlen (time) == 0)
return NULL;
@@ -399,9 +465,12 @@
return time_loc;
}
+
+
/* Unlimited or a number */
gchar *
-translate_visibility (const gchar * vis, units unit)
+translate_visibility (const gchar *vis,
+ units unit)
{
gchar *vis_loc;
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-translate.h
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-translate.h 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-translate.h 2006-12-17 15:15:01 UTC (rev 2243)
@@ -15,15 +15,16 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef TRANSLATE_H
-#define TRANSLATE_H
+#ifndef __WEATHER_TRANSLATE_H__
+#define __WEATHER_TRANSLATE_H__
-
#include <glib.h>
#include <gtk/gtk.h>
-G_BEGIN_DECLS const gchar *translate_desc (const gchar *);
+G_BEGIN_DECLS
+const gchar *translate_desc (const gchar *);
+
const gchar *translate_bard (const gchar *);
const gchar *translate_risk (const gchar *);
@@ -42,4 +43,5 @@
gchar *translate_visibility (const gchar *, units);
G_END_DECLS
+
#endif
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather.c 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather.c 2006-12-17 15:15:01 UTC (rev 2243)
@@ -37,11 +37,18 @@
#include "weather-scrollbox.h"
#define XFCEWEATHER_ROOT "weather"
-#define UPDATE_TIME 1600
-#define BORDER 8
+#define UPDATE_TIME 1600
+#define BORDER 8
+
+
+static gint GTK_ICON_SIZE_SMALL = 0;
+
+
+
gboolean
-check_envproxy (gchar ** proxy_host, gint * proxy_port)
+check_envproxy (gchar **proxy_host,
+ gint *proxy_port)
{
gchar *env_proxy = getenv ("HTTP_PROXY"), *tmp, **split;
@@ -79,13 +86,16 @@
return TRUE;
}
-static gint GTK_ICON_SIZE_SMALL = 0;
+
static gchar *
-make_label (xml_weather * weatherdata, datas opt, units unit, gint size)
+make_label (xml_weather *weatherdata,
+ datas opt,
+ units unit,
+ gint size)
{
- gchar *str, *value;
+ gchar *str, *value;
const gchar *rawvalue, *lbl, *txtsize;
switch (opt)
@@ -163,7 +173,6 @@
{
str = g_strdup_printf ("<span size=\"%s\">%s: %s</span>",
txtsize, lbl, value);
-
g_free (value);
}
else
@@ -175,26 +184,31 @@
return str;
}
+
+
static gchar *
-get_filename (const xfceweather_data * data)
+get_filename (const xfceweather_data *data)
{
+ gchar *filename, *fullfilename;
- gchar *filename = g_strdup_printf ("xfce4/weather-plugin/weather_%s_%c.xml",
- data->location_code,
- data->unit == METRIC ? 'm' : 'i');
+ filename = g_strdup_printf ("xfce4/weather-plugin/weather_%s_%c.xml",
+ data->location_code,
+ data->unit == METRIC ? 'm' : 'i');
- gchar *fullfilename =
- xfce_resource_save_location (XFCE_RESOURCE_CACHE, filename,
- TRUE);
+ fullfilename = xfce_resource_save_location (XFCE_RESOURCE_CACHE, filename,
+ TRUE);
g_free (filename);
return fullfilename;
}
+
+
static void
-set_icon_error (xfceweather_data * data)
+set_icon_error (xfceweather_data *data)
{
- GdkPixbuf *icon = get_icon ("25", data->iconsize);
+ GdkPixbuf *icon = get_icon ("99", data->iconsize);
+
gtk_image_set_from_pixbuf (GTK_IMAGE (data->iconimage), icon);
g_object_unref (G_OBJECT (icon));
@@ -206,21 +220,20 @@
gtk_tooltips_set_tip (data->tooltips, data->tooltipbox,
_("Cannot update weather data"), NULL);
-
- return;
}
+
+
static void
-set_icon_current (xfceweather_data * data)
+set_icon_current (xfceweather_data *data)
{
- guint i;
+ guint i;
GdkPixbuf *icon = NULL;
+ datas opt;
+ gchar *str;
for (i = 0; i < data->labels->len; i++)
{
- datas opt;
- gchar *str;
-
opt = g_array_index (data->labels, datas, i);
str = make_label (data->weatherdata, opt, data->unit, data->size);
@@ -241,24 +254,27 @@
NULL);
}
+
+
static void
-cb_update (gboolean status, gpointer user_data)
+cb_update (gboolean status,
+ gpointer user_data)
{
+ xfceweather_data *data = (xfceweather_data *) user_data;
+ gchar *fullfilename;
+ xmlDoc *doc;
+ xmlNode *cur_node;
+ xml_weather *weather = NULL;
+ fullfilename = get_filename (data);
- xfceweather_data *data = (xfceweather_data *) user_data;
- gchar *fullfilename = get_filename (data);
- xmlDoc *doc;
- xmlNode *cur_node;
- xml_weather *weather = NULL;
-
- if (!fullfilename)
+ if (G_UNLIKELY (fullfilename == NULL))
return;
doc = xmlParseFile (fullfilename);
g_free (fullfilename);
- if (!doc)
+ if (G_UNLIKELY (doc == NULL))
return;
cur_node = xmlDocGetRootElement (doc);
@@ -272,7 +288,6 @@
if (weather)
{
-
if (data->weatherdata)
xml_weather_free (data->weatherdata);
@@ -286,15 +301,18 @@
}
}
+
+
/* -1 error 0 no update needed 1 updating */
static gint
-update_weatherdata (xfceweather_data * data, gboolean force)
+update_weatherdata (xfceweather_data *data,
+ gboolean force)
{
+ struct stat attrs;
+ gchar *fullfilename;
+ gchar *url;
+ gboolean status;
- struct stat attrs;
- gchar *fullfilename;
- gchar *url;
-
if (!data->location_code)
return -1;
@@ -313,10 +331,10 @@
data->location_code, XML_WEATHER_DAYF_N,
data->unit == METRIC ? 'm' : 'i');
- gboolean status = http_get_file (url, "xoap.weather.com", fullfilename,
- data->proxy_host, data->proxy_port,
- cb_update,
- (gpointer) data);
+ status = http_get_file (url, "xoap.weather.com", fullfilename,
+ data->proxy_host, data->proxy_port,
+ cb_update,
+ (gpointer) data);
g_free (url);
g_free (fullfilename);
@@ -334,10 +352,12 @@
}
}
+
+
static void
-update_plugin (xfceweather_data * data, gboolean force)
+update_plugin (xfceweather_data *data,
+ gboolean force)
{
-
if (update_weatherdata (data, force) == -1)
{
gtk_scrollbox_clear (GTK_SCROLLBOX (data->scrollbox));
@@ -346,10 +366,11 @@
/* else update will be called through the callback in http_get_file () */
}
+
+
static GArray *
-labels_clear (GArray * array)
+labels_clear (GArray *array)
{
-
if (!array || array->len > 0)
{
if (array)
@@ -361,16 +382,18 @@
return array;
}
+
+
static void
-xfceweather_read_config (XfcePanelPlugin * plugin, xfceweather_data * data)
+xfceweather_read_config (XfcePanelPlugin *plugin,
+ xfceweather_data *data)
{
-
- gchar label[10];
- guint i;
+ gchar label[10];
+ guint i;
const gchar *value;
- gchar *file;
- XfceRc *rc;
- gint val;
+ gchar *file;
+ XfceRc *rc;
+ gint val;
if (!(file = xfce_panel_plugin_lookup_rc_file (plugin)))
return;
@@ -446,14 +469,16 @@
xfce_rc_close (rc);
}
+
+
static void
-xfceweather_write_config (XfcePanelPlugin * plugin, xfceweather_data * data)
+xfceweather_write_config (XfcePanelPlugin *plugin,
+ xfceweather_data *data)
{
-
- gchar label[10];
- guint i;
+ gchar label[10];
+ guint i;
XfceRc *rc;
- gchar *file;
+ gchar *file;
if (!(file = xfce_panel_plugin_save_location (plugin, TRUE)))
return;
@@ -492,10 +517,11 @@
xfce_rc_close (rc);
}
+
+
static gboolean
-update_cb (xfceweather_data * data)
+update_cb (xfceweather_data *data)
{
-
DBG ("update_cb(): callback called");
update_plugin (data, FALSE);
@@ -505,10 +531,12 @@
return TRUE;
}
+
+
static void
-update_plugin_with_reset (xfceweather_data * data, gboolean force)
+update_plugin_with_reset (xfceweather_data *data,
+ gboolean force)
{
-
if (data->updatetimeout)
g_source_remove (data->updatetimeout);
@@ -522,23 +550,27 @@
static void
update_config (xfceweather_data * data)
{
-
update_plugin_with_reset (data, TRUE); /* force because units could have changed */
}
+
+
static void
-close_summary (GtkWidget * widget, gpointer * user_data)
+close_summary (GtkWidget *widget,
+ gpointer *user_data)
{
-
xfceweather_data *data = (xfceweather_data *) user_data;
data->summary_window = NULL;
}
+
+
static gboolean
-cb_click (GtkWidget * widget, GdkEventButton * event, gpointer user_data)
+cb_click (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data)
{
-
xfceweather_data *data = (xfceweather_data *) user_data;
if (event->button == 1)
@@ -553,8 +585,8 @@
{
data->summary_window = create_summary_window (data->weatherdata,
data->unit);
- g_signal_connect (data->summary_window, "destroy",
- G_CALLBACK (close_summary), (gpointer) data);
+ g_signal_connect (G_OBJECT (data->summary_window), "destroy",
+ G_CALLBACK (close_summary), data);
gtk_widget_show_all (data->summary_window);
}
@@ -565,19 +597,24 @@
return FALSE;
}
+
+
static void
-mi_click (GtkWidget * widget, gpointer user_data)
+mi_click (GtkWidget *widget,
+ gpointer user_data)
{
xfceweather_data *data = (xfceweather_data *) user_data;
update_plugin_with_reset (data, TRUE);
}
+
+
static void
-xfceweather_dialog_response (GtkWidget * dlg,
- gint response, xfceweather_dialog * dialog)
+xfceweather_dialog_response (GtkWidget *dlg,
+ gint response,
+ xfceweather_dialog *dialog)
{
-
xfceweather_data *data = (xfceweather_data *) dialog->wd;
apply_options (dialog);
@@ -590,11 +627,13 @@
xfceweather_write_config (data->plugin, data);
}
+
+
static void
-xfceweather_create_options (XfcePanelPlugin * plugin, xfceweather_data * data)
+xfceweather_create_options (XfcePanelPlugin *plugin,
+ xfceweather_data *data)
{
-
- GtkWidget *dlg, *vbox;
+ GtkWidget *dlg, *vbox;
xfceweather_dialog *dialog;
xfce_panel_plugin_block_menu (plugin);
@@ -618,8 +657,8 @@
dialog = create_config_dialog (data, vbox);
- g_signal_connect (dlg, "response", G_CALLBACK (xfceweather_dialog_response),
- dialog);
+ g_signal_connect (G_OBJECT (dlg), "response",
+ G_CALLBACK (xfceweather_dialog_response), dialog);
set_callback_config_dialog (dialog, update_config);
@@ -627,14 +666,14 @@
}
+
static xfceweather_data *
-xfceweather_create_control (XfcePanelPlugin * plugin)
+xfceweather_create_control (XfcePanelPlugin *plugin)
{
-
xfceweather_data *data = panel_slice_new0 (xfceweather_data);
- GtkWidget *vbox, *refresh;
- datas lbl;
- GdkPixbuf *icon = NULL;
+ GtkWidget *vbox, *refresh;
+ datas lbl;
+ GdkPixbuf *icon = NULL;
if (!GTK_ICON_SIZE_SMALL)
GTK_ICON_SIZE_SMALL = gtk_icon_size_register ("iconsize_small", 16, 16);
@@ -647,7 +686,7 @@
data->scrollbox = gtk_scrollbox_new ();
- icon = get_icon ("25", GTK_ICON_SIZE_SMALL);
+ icon = get_icon ("99", GTK_ICON_SIZE_SMALL);
data->iconimage = gtk_image_new_from_pixbuf (icon);
gtk_misc_set_alignment (GTK_MISC (data->iconimage), 0.5, 1);
g_object_unref (G_OBJECT (icon));
@@ -665,15 +704,15 @@
xfce_panel_plugin_add_action_widget (plugin, data->tooltipbox);
- g_signal_connect (data->tooltipbox, "button-press-event",
- G_CALLBACK (cb_click), (gpointer) data);
+ g_signal_connect (G_OBJECT (data->tooltipbox), "button-press-event",
+ G_CALLBACK (cb_click), data);
/* add refresh button to right click menu, for people who missed the middle mouse click feature */
refresh = gtk_image_menu_item_new_from_stock ("gtk-refresh", NULL);
gtk_widget_show (refresh);
- g_signal_connect (refresh, "activate",
- G_CALLBACK (mi_click), (gpointer) data);
+ g_signal_connect (G_OBJECT (refresh), "activate",
+ G_CALLBACK (mi_click), data);
xfce_panel_plugin_menu_insert_item (plugin, GTK_MENU_ITEM (refresh));
@@ -696,10 +735,12 @@
return data;
}
+
+
static void
-xfceweather_free (XfcePanelPlugin * plugin, xfceweather_data * data)
+xfceweather_free (XfcePanelPlugin *plugin,
+ xfceweather_data *data)
{
-
if (data->weatherdata)
xml_weather_free (data->weatherdata);
@@ -726,11 +767,13 @@
panel_slice_free (xfceweather_data, data);
}
+
+
static gboolean
-xfceweather_set_size (XfcePanelPlugin * panel,
- int size, xfceweather_data * data)
+xfceweather_set_size (XfcePanelPlugin *panel,
+ gint size,
+ xfceweather_data *data)
{
-
data->size = size;
/* arbitrary, choose something that works */
@@ -753,8 +796,10 @@
return TRUE;
}
+
+
static void
-weather_construct (XfcePanelPlugin * plugin)
+weather_construct (XfcePanelPlugin *plugin)
{
xfceweather_data *data;
@@ -768,16 +813,17 @@
gtk_container_add (GTK_CONTAINER (plugin), data->tooltipbox);
- g_signal_connect (plugin, "free-data", G_CALLBACK (xfceweather_free), data);
+ g_signal_connect (G_OBJECT (plugin), "free-data",
+ G_CALLBACK (xfceweather_free), data);
- g_signal_connect (plugin, "save",
+ g_signal_connect (G_OBJECT (plugin), "save",
G_CALLBACK (xfceweather_write_config), data);
- g_signal_connect (plugin, "size-changed",
+ g_signal_connect (G_OBJECT (plugin), "size-changed",
G_CALLBACK (xfceweather_set_size), data);
xfce_panel_plugin_menu_show_configure (plugin);
- g_signal_connect (plugin, "configure-plugin",
+ g_signal_connect (G_OBJECT (plugin), "configure-plugin",
G_CALLBACK (xfceweather_create_options), data);
update_plugin (data, TRUE);
Modified: xfce4-weather-plugin/trunk/panel-plugin/weather.h
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather.h 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather.h 2006-12-17 15:15:01 UTC (rev 2243)
@@ -15,49 +15,52 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef PLUGIN_H
-#define PLUGIN_H
+#ifndef __WEATHER_H__
+#define __WEATHER_H__
#include <libxfce4panel/xfce-panel-plugin.h>
#include <libxfce4util/libxfce4util.h>
-G_BEGIN_DECLS typedef struct
+G_BEGIN_DECLS
+
+typedef struct
{
XfcePanelPlugin *plugin;
- GtkTooltips *tooltips;
+ GtkTooltips *tooltips;
- GtkWidget *scrollbox;
- GtkWidget *iconimage;
- GtkWidget *tooltipbox;
+ GtkWidget *scrollbox;
+ GtkWidget *iconimage;
+ GtkWidget *tooltipbox;
- GtkWidget *summary_window;
+ GtkWidget *summary_window;
- GArray *labels;
+ GArray *labels;
- GtkIconSize iconsize;
+ GtkIconSize iconsize;
- gint size;
- gint updatetimeout;
+ gint size;
+ gint updatetimeout;
- gchar *location_code;
+ gchar *location_code;
- units unit;
+ units unit;
- xml_weather *weatherdata;
+ xml_weather *weatherdata;
- gchar *proxy_host;
- gint proxy_port;
+ gchar *proxy_host;
+ gint proxy_port;
- gboolean proxy_fromenv;
+ gboolean proxy_fromenv;
/* used for storing the configured
* but not active proxy setttings */
- gchar *saved_proxy_host;
- gint saved_proxy_port;
+ gchar *saved_proxy_host;
+ gint saved_proxy_port;
}
xfceweather_data;
gboolean check_envproxy (gchar ** proxy_host, gint * proxy_port);
G_END_DECLS
+
#endif
Modified: xfce4-weather-plugin/trunk/po/ChangeLog
===================================================================
--- xfce4-weather-plugin/trunk/po/ChangeLog 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/po/ChangeLog 2006-12-17 15:15:01 UTC (rev 2243)
@@ -1,3 +1,6 @@
+2006-12-17 Nick Schermer <nick at xfce.org>
+ * Regenerated po(t) files
+
2006-11-24 Maximilian Schleiss <maxschleiss at bluewin.ch>
* fr.po: Updated the French translation
Modified: xfce4-weather-plugin/trunk/po/POTFILES.in
===================================================================
--- xfce4-weather-plugin/trunk/po/POTFILES.in 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/po/POTFILES.in 2006-12-17 15:15:01 UTC (rev 2243)
@@ -1,8 +1,22 @@
-panel-plugin/get_data.c
-panel-plugin/plugin.c
-panel-plugin/summary_window.c
-panel-plugin/config_dialog.c
-panel-plugin/search_dialog.c
-panel-plugin/translate.h
-panel-plugin/translate.c
+panel-plugin/weather.c
+panel-plugin/weather.h
+panel-plugin/weather-config.c
+panel-plugin/weather-config.h
+panel-plugin/weather-data.c
+panel-plugin/weather-data.h
+panel-plugin/weather-http.c
+panel-plugin/weather-http.h
+panel-plugin/weather-icon.c
+panel-plugin/weather-icon.h
+panel-plugin/weather-parsers.c
+panel-plugin/weather-parsers.h
+panel-plugin/weather-scrollbox.c
+panel-plugin/weather-scrollbox.h
+panel-plugin/weather-search.c
+panel-plugin/weather-search.h
+panel-plugin/weather-summary.c
+panel-plugin/weather-summary.h
+panel-plugin/weather-translate.c
+panel-plugin/weather-translate.h
+
panel-plugin/weather.desktop.in.in
Modified: xfce4-weather-plugin/trunk/po/ca.po
===================================================================
--- xfce4-weather-plugin/trunk/po/ca.po 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/po/ca.po 2006-12-17 15:15:01 UTC (rev 2243)
@@ -8,803 +8,986 @@
msgstr ""
"Project-Id-Version: xfce4-weather-plugin 0.5.90.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:12+0200\n"
+"POT-Creation-Date: 2006-12-17 16:10+0100\n"
"PO-Revision-Date: 2006-09-18 20:23+0200\n"
"Last-Translator: Pau Ruŀlan Ferragut <paurullan at bulma.net>\n"
"Language-Team: Catalan\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/get_data.c:309
-msgid "km/h"
-msgstr "km/h"
-
-#: ../panel-plugin/get_data.c:309
-msgid "mph"
-msgstr "mph"
-
-#: ../panel-plugin/get_data.c:312
-msgid "hPa"
-msgstr "hPa"
-
-#: ../panel-plugin/get_data.c:312
-msgid "in"
-msgstr "po"
-
-#: ../panel-plugin/get_data.c:315
-msgid "km"
-msgstr "km"
-
-#: ../panel-plugin/get_data.c:315
-msgid "mi"
-msgstr "mi"
-
-#: ../panel-plugin/plugin.c:98
+#: ../panel-plugin/weather.c:104
msgid "V"
msgstr "V"
-#: ../panel-plugin/plugin.c:99
+#: ../panel-plugin/weather.c:107
msgid "U"
msgstr "U"
-#: ../panel-plugin/plugin.c:100
+#: ../panel-plugin/weather.c:110
msgid "WD"
msgstr "WD"
-#: ../panel-plugin/plugin.c:101 ../panel-plugin/plugin.c:102
+#: ../panel-plugin/weather.c:113 ../panel-plugin/weather.c:116
msgid "P"
msgstr "P"
-#: ../panel-plugin/plugin.c:103
+#: ../panel-plugin/weather.c:119
msgid "F"
msgstr "F"
-#: ../panel-plugin/plugin.c:104
+#: ../panel-plugin/weather.c:122
msgid "T"
msgstr "T"
-#: ../panel-plugin/plugin.c:105
+#: ../panel-plugin/weather.c:125
msgid "D"
msgstr "D"
-#: ../panel-plugin/plugin.c:106
+#: ../panel-plugin/weather.c:128
msgid "H"
msgstr "H"
-#: ../panel-plugin/plugin.c:107
+#: ../panel-plugin/weather.c:131
msgid "WS"
msgstr "WS"
-#: ../panel-plugin/plugin.c:108
+#: ../panel-plugin/weather.c:134
msgid "WG"
msgstr "WG"
-#: ../panel-plugin/plugin.c:189
+#: ../panel-plugin/weather.c:222
msgid "Cannot update weather data"
msgstr "No s’han pogut actualitzar les dades"
-#: ../panel-plugin/plugin.c:593 ../panel-plugin/summary_window.c:356
+#: ../panel-plugin/weather.c:641 ../panel-plugin/weather-summary.c:366
#: ../panel-plugin/weather.desktop.in.in.h:2
msgid "Weather Update"
msgstr "Actualitza Weather"
-#: ../panel-plugin/summary_window.c:75
+#: ../panel-plugin/weather-config.c:36
+msgid "Windchill (F)"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:37
+msgid "Temperature (T)"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:38
+msgid "Atmosphere pressure (P)"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:39
+msgid "Atmosphere state (P)"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:40
+msgid "Wind speed (WS)"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:41
+msgid "Wind gust (WG)"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:42
+msgid "Wind direction (WD)"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:43
+msgid "Humidity (H)"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:44
+msgid "Visibility (V)"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:45
+msgid "UV Index (UV)"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:46
+msgid "Dewpoint (DP)"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:224
+msgid "Please enter proxy settings"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:307
+msgid "Measurement unit:"
+msgstr "Unitat de mesura:"
+
+#: ../panel-plugin/weather-config.c:313
+msgid "Imperial"
+msgstr "Imperial"
+
+#: ../panel-plugin/weather-config.c:315
+msgid "Metric"
+msgstr "Mètrica"
+
+#: ../panel-plugin/weather-config.c:330
+msgid "Location code:"
+msgstr ""
+
+#. proxy
+#: ../panel-plugin/weather-config.c:353
+msgid "Proxy server:"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:356
+msgid "Use proxy server"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:358
+msgid "Auto-detect from environment"
+msgstr ""
+
+#: ../panel-plugin/weather-config.c:430
+msgid "Labels to display"
+msgstr ""
+
+#: ../panel-plugin/weather-data.c:402
+msgid "km/h"
+msgstr "km/h"
+
+#: ../panel-plugin/weather-data.c:402
+msgid "mph"
+msgstr "mph"
+
+#: ../panel-plugin/weather-data.c:405
+msgid "hPa"
+msgstr "hPa"
+
+#: ../panel-plugin/weather-data.c:405
+msgid "in"
+msgstr "po"
+
+#: ../panel-plugin/weather-data.c:408
+msgid "km"
+msgstr "km"
+
+#: ../panel-plugin/weather-data.c:408
+msgid "mi"
+msgstr "mi"
+
+#: ../panel-plugin/weather-search.c:182
+msgid "Search weather location code"
+msgstr ""
+
+#: ../panel-plugin/weather-search.c:191
+msgid "Enter a city name or zip code:"
+msgstr ""
+
+#: ../panel-plugin/weather-search.c:207
+msgid "Results"
+msgstr "Resultats"
+
+#. head
+#: ../panel-plugin/weather-summary.c:82
#, c-format
msgid ""
"Weather report for: %s.\n"
"\n"
msgstr ""
-#: ../panel-plugin/summary_window.c:80
+#: ../panel-plugin/weather-summary.c:87
#, c-format
msgid ""
"Observation station located in %s\n"
"Last update: %s.\n"
msgstr ""
-#: ../panel-plugin/summary_window.c:89
+#. Temperature
+#: ../panel-plugin/weather-summary.c:93
msgid ""
"\n"
"Temperature\n"
msgstr ""
-#: ../panel-plugin/summary_window.c:90
+#: ../panel-plugin/weather-summary.c:94
msgid "Temperature"
msgstr ""
-#: ../panel-plugin/summary_window.c:91
+#: ../panel-plugin/weather-summary.c:95
msgid "Windchill"
msgstr ""
-#: ../panel-plugin/summary_window.c:95
+#. special case for TRANS because of translate_desc
+#: ../panel-plugin/weather-summary.c:98
msgid "Description"
msgstr "Descripció"
-#: ../panel-plugin/summary_window.c:99
+#: ../panel-plugin/weather-summary.c:101
msgid "Dew point"
msgstr ""
-#: ../panel-plugin/summary_window.c:101
+#. Wind
+#: ../panel-plugin/weather-summary.c:104
msgid ""
"\n"
"Wind\n"
msgstr ""
-#: ../panel-plugin/summary_window.c:103
+#: ../panel-plugin/weather-summary.c:106
msgid "Speed"
msgstr "Velocitat"
-#: ../panel-plugin/summary_window.c:110
+#: ../panel-plugin/weather-summary.c:111
msgid "Direction"
msgstr "Direcció"
-#: ../panel-plugin/summary_window.c:117
+#: ../panel-plugin/weather-summary.c:117
msgid "Gusts"
msgstr ""
-#: ../panel-plugin/summary_window.c:122
+#. UV
+#: ../panel-plugin/weather-summary.c:122
msgid ""
"\n"
"UV\n"
msgstr ""
-#: ../panel-plugin/summary_window.c:123
+#: ../panel-plugin/weather-summary.c:123
msgid "Index"
msgstr "Índex"
-#: ../panel-plugin/summary_window.c:125
+#: ../panel-plugin/weather-summary.c:124
msgid "Risk"
msgstr ""
-#: ../panel-plugin/summary_window.c:129
+#. Atmospheric pressure
+#: ../panel-plugin/weather-summary.c:129
msgid ""
"\n"
"Atmospheric pressure\n"
msgstr ""
-#: ../panel-plugin/summary_window.c:130
+#: ../panel-plugin/weather-summary.c:130
msgid "Pressure"
msgstr "Pressió"
-#: ../panel-plugin/summary_window.c:133
+#: ../panel-plugin/weather-summary.c:132
msgid "State"
msgstr "Estat"
-#: ../panel-plugin/summary_window.c:137
+#. Sun
+#: ../panel-plugin/weather-summary.c:137
msgid ""
"\n"
"Sun\n"
msgstr ""
-#: ../panel-plugin/summary_window.c:141
+#: ../panel-plugin/weather-summary.c:140
msgid "Rise"
msgstr "Alçada"
-#: ../panel-plugin/summary_window.c:149
+#: ../panel-plugin/weather-summary.c:146
msgid "Set"
msgstr "Fixa"
-#: ../panel-plugin/summary_window.c:155
+#. Other
+#: ../panel-plugin/weather-summary.c:151
msgid ""
"\n"
"Other\n"
msgstr ""
-#: ../panel-plugin/summary_window.c:156
+#: ../panel-plugin/weather-summary.c:152
msgid "Humidity"
msgstr ""
-#: ../panel-plugin/summary_window.c:158
+#: ../panel-plugin/weather-summary.c:154
msgid "Visibility"
msgstr "Visibilitat"
-#: ../panel-plugin/summary_window.c:209
+#: ../panel-plugin/weather-summary.c:207
#, c-format
msgid "Day: %s"
msgstr ""
-#: ../panel-plugin/summary_window.c:212
+#: ../panel-plugin/weather-summary.c:212
#, c-format
msgid "Night: %s"
msgstr ""
-#: ../panel-plugin/summary_window.c:222
+#: ../panel-plugin/weather-summary.c:223
msgid "<b>Precipitation</b>"
msgstr ""
-#: ../panel-plugin/summary_window.c:243
+#: ../panel-plugin/weather-summary.c:245
msgid "<b>Temperature</b>"
msgstr ""
-#: ../panel-plugin/summary_window.c:267
+#: ../panel-plugin/weather-summary.c:269
msgid "<b>Wind</b>"
msgstr ""
-#: ../panel-plugin/summary_window.c:362
+#: ../panel-plugin/weather-summary.c:372
#, c-format
msgid "Weather report for: %s"
msgstr ""
-#: ../panel-plugin/summary_window.c:382
+#: ../panel-plugin/weather-summary.c:393
msgid "Summary"
msgstr "Resum"
-#: ../panel-plugin/summary_window.c:384
+#: ../panel-plugin/weather-summary.c:396
msgid "Forecast"
msgstr "Pronòstic"
-#: ../panel-plugin/config_dialog.c:36
-msgid "Windchill (F)"
+#: ../panel-plugin/weather-translate.c:39
+msgid "AM Clouds / PM Sun"
msgstr ""
-#: ../panel-plugin/config_dialog.c:37
-msgid "Temperature (T)"
+#: ../panel-plugin/weather-translate.c:40
+msgid "AM Light Rain"
msgstr ""
-#: ../panel-plugin/config_dialog.c:38
-msgid "Atmosphere pressure (P)"
+#: ../panel-plugin/weather-translate.c:41
+msgid "AM Light Snow"
msgstr ""
-#: ../panel-plugin/config_dialog.c:39
-msgid "Atmosphere state (P)"
+#: ../panel-plugin/weather-translate.c:42
+msgid "AM Rain / Snow Showers"
msgstr ""
-#: ../panel-plugin/config_dialog.c:40
-msgid "Wind speed (WS)"
+#: ../panel-plugin/weather-translate.c:43
+msgid "AM Rain / Wind"
msgstr ""
-#: ../panel-plugin/config_dialog.c:41
-msgid "Wind gust (WG)"
+#: ../panel-plugin/weather-translate.c:44
+msgid "AM Showers"
msgstr ""
-#: ../panel-plugin/config_dialog.c:42
-msgid "Wind direction (WD)"
+#: ../panel-plugin/weather-translate.c:45
+msgid "AM Showers / Wind"
msgstr ""
-#: ../panel-plugin/config_dialog.c:43
-msgid "Humidity (H)"
+#: ../panel-plugin/weather-translate.c:46
+msgid "AM Snow Showers"
msgstr ""
-#: ../panel-plugin/config_dialog.c:44
-msgid "Visibility (V)"
+#: ../panel-plugin/weather-translate.c:47
+msgid "AM Snow Showers / Wind"
msgstr ""
-#: ../panel-plugin/config_dialog.c:45
-msgid "UV Index (UV)"
+#: ../panel-plugin/weather-translate.c:48
+msgid "AM T-Storms"
msgstr ""
-#: ../panel-plugin/config_dialog.c:46
-msgid "Dewpoint (DP)"
-msgstr ""
-
-#: ../panel-plugin/config_dialog.c:198
-msgid "Please enter proxy settings"
-msgstr ""
-
-#: ../panel-plugin/config_dialog.c:269
-msgid "Measurement unit:"
-msgstr "Unitat de mesura:"
-
-#: ../panel-plugin/config_dialog.c:275
-msgid "Imperial"
-msgstr "Imperial"
-
-#: ../panel-plugin/config_dialog.c:277
-msgid "Metric"
-msgstr "Mètrica"
-
-#: ../panel-plugin/config_dialog.c:292
-msgid "Location code:"
-msgstr ""
-
-#. proxy
-#: ../panel-plugin/config_dialog.c:314
-msgid "Proxy server:"
-msgstr ""
-
-#: ../panel-plugin/config_dialog.c:316
-msgid "Use proxy server"
-msgstr ""
-
-#: ../panel-plugin/config_dialog.c:318
-msgid "Auto-detect from environment"
-msgstr ""
-
-#: ../panel-plugin/config_dialog.c:387
-msgid "Labels to display"
-msgstr ""
-
-#: ../panel-plugin/search_dialog.c:174
-msgid "Search weather location code"
-msgstr ""
-
-#: ../panel-plugin/search_dialog.c:184
-msgid "Enter a city name or zip code:"
-msgstr ""
-
-#: ../panel-plugin/search_dialog.c:199
-msgid "Results"
-msgstr "Resultats"
-
-#: ../panel-plugin/translate.c:32
-msgid "Snow to Rain"
-msgstr ""
-
-#: ../panel-plugin/translate.c:33
+#: ../panel-plugin/weather-translate.c:49
msgid "Becoming Cloudy"
msgstr ""
-#: ../panel-plugin/translate.c:34
+#: ../panel-plugin/weather-translate.c:50
msgid "Blizzard"
msgstr "Ventada lleugera"
-#: ../panel-plugin/translate.c:35
+#: ../panel-plugin/weather-translate.c:51
msgid "Blizzard Conditions"
msgstr ""
-#: ../panel-plugin/translate.c:36
+#: ../panel-plugin/weather-translate.c:52
msgid "Blowing Snow"
msgstr ""
-#: ../panel-plugin/translate.c:37
+#: ../panel-plugin/weather-translate.c:53
msgid "Chance of Rain"
msgstr ""
-#: ../panel-plugin/translate.c:38
+#: ../panel-plugin/weather-translate.c:54
msgid "Chance of Rain/Snow"
msgstr ""
-#: ../panel-plugin/translate.c:39
+#: ../panel-plugin/weather-translate.c:55
msgid "Chance of Showers"
msgstr ""
-#: ../panel-plugin/translate.c:40
+#: ../panel-plugin/weather-translate.c:56
msgid "Chance of Snow"
msgstr ""
-#: ../panel-plugin/translate.c:41
+#: ../panel-plugin/weather-translate.c:57
msgid "Chance of Snow/Rain"
msgstr ""
-#: ../panel-plugin/translate.c:42
+#: ../panel-plugin/weather-translate.c:58
msgid "Chance of T-Storm"
msgstr ""
-#: ../panel-plugin/translate.c:43
+#: ../panel-plugin/weather-translate.c:59
msgid "Clear"
msgstr "Buida"
-#: ../panel-plugin/translate.c:44
+#: ../panel-plugin/weather-translate.c:60
msgid "Clearing"
msgstr ""
-#: ../panel-plugin/translate.c:45
+#: ../panel-plugin/weather-translate.c:61
msgid "Clouds"
msgstr ""
-#: ../panel-plugin/translate.c:46
+#: ../panel-plugin/weather-translate.c:62
+msgid "Clouds Early / Clearing Late"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:63
msgid "Cloudy"
msgstr "Núvols"
-#: ../panel-plugin/translate.c:47
+#: ../panel-plugin/weather-translate.c:64
+#, fuzzy
+msgid "Cloudy / Wind"
+msgstr "Núvols"
+
+#: ../panel-plugin/weather-translate.c:65
msgid "Cloudy Periods"
msgstr ""
-#: ../panel-plugin/translate.c:48
+#: ../panel-plugin/weather-translate.c:66
msgid "Continued Hot"
msgstr ""
-#: ../panel-plugin/translate.c:49
+#: ../panel-plugin/weather-translate.c:67
msgid "Cumulonimbus Clouds Observed"
msgstr ""
-#: ../panel-plugin/translate.c:50
+#: ../panel-plugin/weather-translate.c:68
msgid "Drifting Snow"
msgstr ""
-#: ../panel-plugin/translate.c:51
+#: ../panel-plugin/weather-translate.c:69
+msgid "Drifting Snow and Windy"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:70
msgid "Drizzle"
msgstr "Plugims"
-#: ../panel-plugin/translate.c:52
+#: ../panel-plugin/weather-translate.c:71
msgid "Dry"
msgstr ""
-#: ../panel-plugin/translate.c:53
+#: ../panel-plugin/weather-translate.c:72
+msgid "Dust"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:73
msgid "Fair"
msgstr "Bon temps"
-#: ../panel-plugin/translate.c:54
-msgid "Flurries"
+#: ../panel-plugin/weather-translate.c:74
+msgid "Few Showers"
msgstr ""
-#: ../panel-plugin/translate.c:55
+#: ../panel-plugin/weather-translate.c:75
+msgid "Few Snow Showers"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:76
msgid "Fog"
msgstr "Boira"
-#: ../panel-plugin/translate.c:56
+#: ../panel-plugin/weather-translate.c:77
msgid "Freezing Drizzle"
msgstr ""
-#: ../panel-plugin/translate.c:57
+#: ../panel-plugin/weather-translate.c:78
msgid "Freezing Rain"
msgstr ""
-#: ../panel-plugin/translate.c:58
+#: ../panel-plugin/weather-translate.c:79
msgid "Freezing Rain/Snow"
msgstr ""
-#: ../panel-plugin/translate.c:59
+#: ../panel-plugin/weather-translate.c:80
+msgid "Frigid"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:81
msgid "Frozen Precip"
msgstr ""
-#: ../panel-plugin/translate.c:60
+#: ../panel-plugin/weather-translate.c:82
+msgid "Hail"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:83
+msgid "Haze"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:84
msgid "Hazy"
msgstr ""
-#: ../panel-plugin/translate.c:61
+#: ../panel-plugin/weather-translate.c:85
msgid "Heavy Rain"
msgstr ""
-#: ../panel-plugin/translate.c:62
+#: ../panel-plugin/weather-translate.c:86
msgid "Heavy Snow"
msgstr ""
-#: ../panel-plugin/translate.c:63
+#: ../panel-plugin/weather-translate.c:87
msgid "Hot And Humid"
msgstr ""
-#: ../panel-plugin/translate.c:64
+#: ../panel-plugin/weather-translate.c:88
+msgid "Hot!"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:89
msgid "Ice Crystals"
msgstr ""
-#: ../panel-plugin/translate.c:65
+#: ../panel-plugin/weather-translate.c:90
msgid "Ice/Snow Mixture"
msgstr ""
-#: ../panel-plugin/translate.c:66
+#: ../panel-plugin/weather-translate.c:91
msgid "Increasing Clouds"
msgstr ""
-#: ../panel-plugin/translate.c:67
+#: ../panel-plugin/weather-translate.c:92
msgid "Isolated Showers"
msgstr ""
-#: ../panel-plugin/translate.c:68
+#: ../panel-plugin/weather-translate.c:93
+msgid "Isolated T-Storms"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:94
+msgid "Light Drizzle"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:95
+msgid "Light Drizzle and Windy"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:96
msgid "Light Rain"
msgstr ""
-#: ../panel-plugin/translate.c:69
+#: ../panel-plugin/weather-translate.c:97
+msgid "Light Rain / Wind"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:98
+msgid "Light rain late"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:99
+msgid "Light Rain Shower"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:100
msgid "Light Snow"
msgstr ""
-#: ../panel-plugin/translate.c:70
+#: ../panel-plugin/weather-translate.c:101
msgid "Lightning Observed"
msgstr ""
-#: ../panel-plugin/translate.c:71
-msgid "mild and breezy"
+#: ../panel-plugin/weather-translate.c:102
+msgid "Mild and Breezy"
msgstr ""
-#: ../panel-plugin/translate.c:72
+#: ../panel-plugin/weather-translate.c:103
msgid "Mist"
msgstr "Boira"
-#: ../panel-plugin/translate.c:73
+#: ../panel-plugin/weather-translate.c:104
msgid "Mostly Clear"
msgstr ""
-#: ../panel-plugin/translate.c:74
+#: ../panel-plugin/weather-translate.c:105
msgid "Mostly Cloudy"
msgstr ""
-#: ../panel-plugin/translate.c:75
+#: ../panel-plugin/weather-translate.c:106
+msgid "Mostly Cloudy / Wind"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:107
+msgid "Mostly Cloudy and Windy"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:108
msgid "Mostly Sunny"
msgstr ""
-#: ../panel-plugin/translate.c:76 ../panel-plugin/translate.c:368
-msgid "N/A"
-msgstr "N/A"
+#: ../panel-plugin/weather-translate.c:109
+msgid "Mostly Sunny / Wind"
+msgstr ""
-#: ../panel-plugin/translate.c:77
+#: ../panel-plugin/weather-translate.c:110
+msgid "N/A Not Available"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:111
msgid "Occasional Sunshine"
msgstr ""
-#: ../panel-plugin/translate.c:78
+#: ../panel-plugin/weather-translate.c:112
msgid "Overcast"
msgstr "Ennuvolat"
-#: ../panel-plugin/translate.c:79
+#: ../panel-plugin/weather-translate.c:113
msgid "Partial Clearing"
msgstr ""
-#: ../panel-plugin/translate.c:80
+#: ../panel-plugin/weather-translate.c:114
+msgid "Partial Fog"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:115
msgid "Partial Sunshine"
msgstr ""
-#: ../panel-plugin/translate.c:81
+#: ../panel-plugin/weather-translate.c:116
msgid "Partly Cloudy"
msgstr ""
-#: ../panel-plugin/translate.c:82
+#: ../panel-plugin/weather-translate.c:117
+msgid "Partly Cloudy / Wind"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:118
+msgid "Partly Cloudy and Windy"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:119
msgid "Partly Sunny"
msgstr ""
-#: ../panel-plugin/translate.c:83
+#: ../panel-plugin/weather-translate.c:120
+msgid "PM Light Rain"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:121
+msgid "PM Light Snow"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:122
+msgid "PM Rain / Wind"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:123
+msgid "PM Showers"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:124
+msgid "PM Snow Showers"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:125
+msgid "PM T-Storms"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:126
msgid "Rain"
msgstr "Pluja"
-#: ../panel-plugin/translate.c:84
-msgid "Rain and Snow"
+#: ../panel-plugin/weather-translate.c:127
+msgid "Rain / Snow"
msgstr ""
-#: ../panel-plugin/translate.c:85
-msgid "Rain or Snow"
+#: ../panel-plugin/weather-translate.c:128
+msgid "Rain / Snow / Wind"
msgstr ""
-#: ../panel-plugin/translate.c:86
-msgid "Rain Showers"
+#: ../panel-plugin/weather-translate.c:129
+msgid "Rain / Snow Late"
msgstr ""
-#: ../panel-plugin/translate.c:87
-msgid "Rain to Snow"
+#: ../panel-plugin/weather-translate.c:130
+msgid "Rain / Snow Showers"
msgstr ""
-#: ../panel-plugin/translate.c:88
-msgid "Rain / Snow Showers"
+#: ../panel-plugin/weather-translate.c:131
+msgid "Rain / Thunder"
msgstr ""
-#: ../panel-plugin/translate.c:89
-msgid "Showers"
+#: ../panel-plugin/weather-translate.c:132
+msgid "Rain / Wind"
msgstr ""
-#: ../panel-plugin/translate.c:90
-msgid "Sleet"
-msgstr "Aiguaneu"
+#: ../panel-plugin/weather-translate.c:133
+msgid "Rain and Sleet"
+msgstr ""
-#: ../panel-plugin/translate.c:91
-msgid "Sleet and Snow"
+#: ../panel-plugin/weather-translate.c:134
+msgid "Rain and Snow"
msgstr ""
-#: ../panel-plugin/translate.c:92
-msgid "Smoke"
-msgstr "Fum"
+#: ../panel-plugin/weather-translate.c:135
+msgid "Rain or Snow"
+msgstr ""
-#: ../panel-plugin/translate.c:93
-msgid "Snow"
-msgstr "Neu"
+#: ../panel-plugin/weather-translate.c:136
+msgid "Rain Shower"
+msgstr ""
-#: ../panel-plugin/translate.c:94
-msgid "Snow and Rain"
+#: ../panel-plugin/weather-translate.c:137
+msgid "Rain Shower and Windy"
msgstr ""
-#: ../panel-plugin/translate.c:95
-msgid "Snow or Rain"
+#: ../panel-plugin/weather-translate.c:138
+msgid "Rain to snow"
msgstr ""
-#: ../panel-plugin/translate.c:96
-msgid "Snow Showers"
+#: ../panel-plugin/weather-translate.c:139
+msgid "Rain/Lightning"
msgstr ""
-#: ../panel-plugin/translate.c:97
-msgid "Sunny"
-msgstr "Sol"
+#: ../panel-plugin/weather-translate.c:140
+msgid "Scattered Showers"
+msgstr ""
-#: ../panel-plugin/translate.c:98
-msgid "Thunder"
+#: ../panel-plugin/weather-translate.c:141
+msgid "Scattered Snow Showers"
msgstr ""
-#: ../panel-plugin/translate.c:99
-msgid "Thunder storms"
+#: ../panel-plugin/weather-translate.c:142
+msgid "Scattered Snow Showers / Wind"
msgstr ""
-#: ../panel-plugin/translate.c:100
-msgid "Variable Cloudiness"
+#: ../panel-plugin/weather-translate.c:143
+msgid "Scattered T-Storms"
msgstr ""
-#: ../panel-plugin/translate.c:101
-msgid "Variable Clouds"
+#: ../panel-plugin/weather-translate.c:144
+msgid "Showers"
msgstr ""
-#: ../panel-plugin/translate.c:102
-msgid "Windy"
-msgstr "Ventós"
+#: ../panel-plugin/weather-translate.c:145
+msgid "Showers / Wind"
+msgstr ""
-#: ../panel-plugin/translate.c:103
-msgid "Wintry Mix"
+#: ../panel-plugin/weather-translate.c:146
+msgid "Showers Early"
msgstr ""
-#: ../panel-plugin/translate.c:104
+#: ../panel-plugin/weather-translate.c:147
msgid "Showers in the Vicinity"
msgstr ""
-#: ../panel-plugin/translate.c:105
-msgid "Light Rain Shower"
+#: ../panel-plugin/weather-translate.c:148
+msgid "Showers in the Vincinity"
msgstr ""
-#: ../panel-plugin/translate.c:106
+#: ../panel-plugin/weather-translate.c:149
msgid "Showers Late"
msgstr ""
-#: ../panel-plugin/translate.c:107
-msgid "PM Showers"
+#: ../panel-plugin/weather-translate.c:150
+msgid "Sleet and Snow"
msgstr ""
-#: ../panel-plugin/translate.c:108
-msgid "Light Rain / Wind"
+#: ../panel-plugin/weather-translate.c:151
+msgid "Smoke"
+msgstr "Fum"
+
+#: ../panel-plugin/weather-translate.c:152
+msgid "Snow"
+msgstr "Neu"
+
+#: ../panel-plugin/weather-translate.c:153
+msgid "Snow and Rain"
msgstr ""
-#: ../panel-plugin/translate.c:109
-msgid "Scattered Showers"
+#: ../panel-plugin/weather-translate.c:154
+msgid "Snow or Rain"
msgstr ""
-#: ../panel-plugin/translate.c:110
-msgid "PM Light Rain"
+#: ../panel-plugin/weather-translate.c:155
+msgid "Snow Shower"
msgstr ""
-#: ../panel-plugin/translate.c:111
-msgid "AM Showers"
+#: ../panel-plugin/weather-translate.c:156
+msgid "Snow Shower / Wind"
msgstr ""
-#: ../panel-plugin/translate.c:112
-msgid "AM Light Rain"
+#: ../panel-plugin/weather-translate.c:157
+msgid "Snow Showers Early"
msgstr ""
-#: ../panel-plugin/translate.c:113
-msgid "Partly Cloudy and Windy"
+#: ../panel-plugin/weather-translate.c:158
+msgid "Snow Showers early"
msgstr ""
-#: ../panel-plugin/translate.c:114
-msgid "Few Showers"
+#: ../panel-plugin/weather-translate.c:159
+msgid "Snow Showers Late"
msgstr ""
-#: ../panel-plugin/translate.c:115
-msgid "Light Drizzle"
+#: ../panel-plugin/weather-translate.c:160
+msgid "Snow to Rain"
msgstr ""
-#: ../panel-plugin/translate.c:116
-msgid "Clouds Early / Clearing Late"
+#: ../panel-plugin/weather-translate.c:161
+msgid "Sunny"
+msgstr "Sol"
+
+#: ../panel-plugin/weather-translate.c:162
+msgid "Sunny / Wind"
msgstr ""
-#: ../panel-plugin/translate.c:117
-msgid "Mostly Cloudy and Windy"
+#: ../panel-plugin/weather-translate.c:163
+msgid "T-Showers"
msgstr ""
-#: ../panel-plugin/translate.c:118
-msgid "Rain / Snow"
+#: ../panel-plugin/weather-translate.c:164
+msgid "T-Storm"
msgstr ""
-#: ../panel-plugin/translate.c:119
-msgid "Rain and Sleet"
+#: ../panel-plugin/weather-translate.c:165
+msgid "T-Storms / Wind"
msgstr ""
-#: ../panel-plugin/translate.c:120
-msgid "Snow Showers Late"
+#: ../panel-plugin/weather-translate.c:166
+msgid "T-Storms Early"
msgstr ""
-#: ../panel-plugin/translate.c:121
-msgid "Light Drizzle and Windy"
+#: ../panel-plugin/weather-translate.c:167
+msgid "Thunder"
msgstr ""
-#: ../panel-plugin/translate.c:122
-msgid "Snow Shower"
+#: ../panel-plugin/weather-translate.c:168
+msgid "Thunder in the Vincinity"
msgstr ""
-#: ../panel-plugin/translate.c:123
-msgid "Snow Showers Early"
+#: ../panel-plugin/weather-translate.c:169
+msgid "Variable Cloudiness"
msgstr ""
-#: ../panel-plugin/translate.c:124
-msgid "Few Snow Showers"
+#: ../panel-plugin/weather-translate.c:170
+msgid "Variable Clouds"
msgstr ""
-#: ../panel-plugin/translate.c:129
+#: ../panel-plugin/weather-translate.c:171
+#, fuzzy
+msgid "Windy/Rain"
+msgstr "Ventós"
+
+#: ../panel-plugin/weather-translate.c:172
+#, fuzzy
+msgid "Windy/Snow"
+msgstr "Ventós"
+
+#: ../panel-plugin/weather-translate.c:173
+msgid "Wintry Mix"
+msgstr ""
+
+#: ../panel-plugin/weather-translate.c:180
msgid "rising"
msgstr ""
-#: ../panel-plugin/translate.c:130
+#: ../panel-plugin/weather-translate.c:181
msgid "steady"
msgstr ""
-#: ../panel-plugin/translate.c:131
+#: ../panel-plugin/weather-translate.c:182
msgid "falling"
msgstr ""
-#: ../panel-plugin/translate.c:136
+#: ../panel-plugin/weather-translate.c:189
msgid "Low"
msgstr "Baixa"
-#: ../panel-plugin/translate.c:137
+#: ../panel-plugin/weather-translate.c:190
msgid "Moderate"
msgstr ""
-#: ../panel-plugin/translate.c:138
+#: ../panel-plugin/weather-translate.c:191
msgid "High"
msgstr "Alta"
-#: ../panel-plugin/translate.c:139
+#: ../panel-plugin/weather-translate.c:192
msgid "Very High"
msgstr "Molt alta"
-#: ../panel-plugin/translate.c:140
+#: ../panel-plugin/weather-translate.c:193
msgid "Extreme"
msgstr ""
-#: ../panel-plugin/translate.c:145
+#: ../panel-plugin/weather-translate.c:200
msgid "S"
msgstr "S"
-#: ../panel-plugin/translate.c:146
+#: ../panel-plugin/weather-translate.c:201
msgid "SSW"
msgstr ""
-#: ../panel-plugin/translate.c:147
+#: ../panel-plugin/weather-translate.c:202
msgid "SW"
msgstr ""
-#: ../panel-plugin/translate.c:148
+#: ../panel-plugin/weather-translate.c:203
msgid "WSW"
msgstr ""
-#: ../panel-plugin/translate.c:149
+#: ../panel-plugin/weather-translate.c:204
msgid "W"
msgstr "W"
-#: ../panel-plugin/translate.c:150
+#: ../panel-plugin/weather-translate.c:205
msgid "WNW"
msgstr ""
-#: ../panel-plugin/translate.c:151
+#: ../panel-plugin/weather-translate.c:206
msgid "NW"
msgstr ""
-#: ../panel-plugin/translate.c:152
+#: ../panel-plugin/weather-translate.c:207
msgid "NNW"
msgstr ""
-#: ../panel-plugin/translate.c:153
+#: ../panel-plugin/weather-translate.c:208
msgid "N"
msgstr "N"
-#: ../panel-plugin/translate.c:154
+#: ../panel-plugin/weather-translate.c:209
msgid "NNE"
msgstr ""
-#: ../panel-plugin/translate.c:155
+#: ../panel-plugin/weather-translate.c:210
msgid "NE"
msgstr ""
-#: ../panel-plugin/translate.c:156
+#: ../panel-plugin/weather-translate.c:211
msgid "ENE"
msgstr ""
-#: ../panel-plugin/translate.c:157
+#: ../panel-plugin/weather-translate.c:212
msgid "E"
msgstr "E"
-#: ../panel-plugin/translate.c:158
+#: ../panel-plugin/weather-translate.c:213
msgid "ESE"
msgstr ""
-#: ../panel-plugin/translate.c:159
+#: ../panel-plugin/weather-translate.c:214
msgid "SE"
msgstr ""
-#: ../panel-plugin/translate.c:160
+#: ../panel-plugin/weather-translate.c:215
msgid "SSE"
msgstr ""
-#: ../panel-plugin/translate.c:272
+#: ../panel-plugin/weather-translate.c:334
#, c-format
msgid "%x at %X Local Time"
msgstr ""
-#: ../panel-plugin/translate.c:366
+#: ../panel-plugin/weather-translate.c:428
msgid "calm"
msgstr ""
-#: ../panel-plugin/translate.c:413
+#: ../panel-plugin/weather-translate.c:430
+msgid "N/A"
+msgstr "N/A"
+
+#: ../panel-plugin/weather-translate.c:478
msgid "Unlimited"
msgstr "Il·limitat"
@@ -812,3 +995,5 @@
msgid "Show current weather conditions"
msgstr ""
+#~ msgid "Sleet"
+#~ msgstr "Aiguaneu"
Modified: xfce4-weather-plugin/trunk/po/cs.po
===================================================================
--- xfce4-weather-plugin/trunk/po/cs.po 2006-12-17 14:05:39 UTC (rev 2242)
+++ xfce4-weather-plugin/trunk/po/cs.po 2006-12-17 15:15:01 UTC (rev 2243)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-weather-plugin 0.5.90.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2006-12-17 16:10+0100\n"
"PO-Revision-Date: 2006-08-27 11:42+0100\n"
"Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
"Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -16,80 +16,174 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../panel-plugin/get_data.c:309
-msgid "km/h"
-msgstr "km/h"
-
-#: ../panel-plugin/get_data.c:309
-msgid "mph"
-msgstr "mi/h"
-
-#: ../panel-plugin/get_data.c:312
-msgid "hPa"
-msgstr "hPa"
-
-#: ../panel-plugin/get_data.c:312
-msgid "in"
-msgstr "v"
-
-#: ../panel-plugin/get_data.c:315
-msgid "km"
-msgstr "km"
-
-#: ../panel-plugin/get_data.c:315
-msgid "mi"
-msgstr "mi"
-
-#: ../panel-plugin/plugin.c:98
+#: ../panel-plugin/weather.c:104
msgid "V"
msgstr "V"
-#: ../panel-plugin/plugin.c:99
+#: ../panel-plugin/weather.c:107
msgid "U"
msgstr "U"
-#: ../panel-plugin/plugin.c:100
+#: ../panel-plugin/weather.c:110
msgid "WD"
msgstr "WD"
-#: ../panel-plugin/plugin.c:101 ../panel-plugin/plugin.c:102
+#: ../panel-plugin/weather.c:113 ../panel-plugin/weather.c:116
msgid "P"
msgstr "P"
-#: ../panel-plugin/plugin.c:103
+#: ../panel-plugin/weather.c:119
msgid "F"
msgstr "F"
-#: ../panel-plugin/plugin.c:104
+#: ../panel-plugin/weather.c:122
msgid "T"
msgstr "T"
-#: ../panel-plugin/plugin.c:105
+#: ../panel-plugin/weather.c:125
msgid "D"
msgstr "D"
-#: ../panel-plugin/plugin.c:106
+#: ../panel-plugin/weather.c:128
msgid "H"
msgstr "H"
-#: ../panel-plugin/plugin.c:107
+#: ../panel-plugin/weather.c:131
msgid "WS"
msgstr "WS"
-#: ../panel-plugin/plugin.c:108
+#: ../panel-plugin/weather.c:134
msgid "WG"
msgstr "WG"
-#: ../panel-plugin/plugin.c:189
+#: ../panel-plugin/weather.c:222
msgid "Cannot update weather data"
msgstr "Nelze aktualizovat informace o počasí"
-#: ../panel-plugin/plugin.c:593 ../panel-plugin/summary_window.c:356
+#: ../panel-plugin/weather.c:641 ../panel-plugin/weather-summary.c:366
#: ../panel-plugin/weather.desktop.in.in.h:2
msgid "Weather Update"
msgstr "Aktualizace dat o počasí"
-#: ../panel-plugin/summary_window.c:75
+#: ../panel-plugin/weather-config.c:36
+msgid "Windchill (F)"
+msgstr "Studený vítr (F)"
+
+#: ../panel-plugin/weather-config.c:37
+msgid "Temperature (T)"
+msgstr "Teplota (T)"
+
+#: ../panel-plugin/weather-config.c:38
+msgid "Atmosphere pressure (P)"
+msgstr "Atmosférický tlak (P)"
+
+#: ../panel-plugin/weather-config.c:39
+msgid "Atmosphere state (P)"
+msgstr "Atmosférický stav (P)"
+
+#: ../panel-plugin/weather-config.c:40
+msgid "Wind speed (WS)"
+msgstr "Rychlost větru (WS)"
+
+#: ../panel-plugin/weather-config.c:41
+msgid "Wind gust (WG)"
+msgstr "Nárazy větru (WG)"
+
+#: ../panel-plugin/weather-config.c:42
+msgid "Wind direction (WD)"
+msgstr "Směr větru (WD)"
+
+#: ../panel-plugin/weather-config.c:43
+ms