[Xfce4-commits] xfce4-settings:master Don't use Both in comboboxes (bug #9491).
Updating branch refs/heads/master
to 4346168db9aba1a9d4878b6ebe9aca41fd898917 (commit)
from a04edfc41ab2035383793ca8315e2e61351108c2 (commit)
commit 4346168db9aba1a9d4878b6ebe9aca41fd898917
Author: Jérôme Guelfucci jero...@xfce.org
Date: Wed Dec 19 09:27:19 2012 +0100
Don't use Both in comboboxes (bug #9491).
.../appearance-settings/appearance-dialog.glade| 16
dialogs/display-settings/main.c|8
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dialogs/appearance-settings/appearance-dialog.glade
b/dialogs/appearance-settings/appearance-dialog.glade
index a6c656d..34b975b 100644
--- a/dialogs/appearance-settings/appearance-dialog.glade
+++ b/dialogs/appearance-settings/appearance-dialog.glade
@@ -21,8 +21,8 @@
property name=can_focusFalse/property
property name=layout_styleend/property
child
- object class=GtkButton id=button2
-property name=labelgtk-help/property
+ object class=GtkButton id=button1
+property name=labelgtk-close/property
property name=use_action_appearanceFalse/property
property name=visibleTrue/property
property name=can_focusTrue/property
@@ -33,12 +33,11 @@
property name=expandFalse/property
property name=fillFalse/property
property name=position0/property
-property name=secondaryTrue/property
/packing
/child
child
- object class=GtkButton id=button1
-property name=labelgtk-close/property
+ object class=GtkButton id=button2
+property name=labelgtk-help/property
property name=use_action_appearanceFalse/property
property name=visibleTrue/property
property name=can_focusTrue/property
@@ -49,6 +48,7 @@
property name=expandFalse/property
property name=fillFalse/property
property name=position0/property
+property name=secondaryTrue/property
/packing
/child
/object
@@ -646,8 +646,8 @@
/object
/child
action-widgets
- action-widget response=-11button2/action-widget
action-widget response=0button1/action-widget
+ action-widget response=-11button2/action-widget
/action-widgets
/object
object class=GtkListStore id=liststore1
@@ -683,10 +683,10 @@
col id=0 translatable=yesText/col
/row
row
-col id=0 translatable=yesBoth/col
+col id=0 translatable=yesText under icons/col
/row
row
-col id=0 translatable=yesBoth Horizontal/col
+col id=0 translatable=yesText next to icons/col
/row
/data
/object
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 4136542..6dcfc5b 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -114,7 +114,7 @@ static const XfceRotation reflection_names[] =
{ 0, N_(None) },
{ RR_Reflect_X, N_(Horizontal) },
{ RR_Reflect_Y, N_(Vertical) },
-{ RR_Reflect_X|RR_Reflect_Y, N_(Both) }
+{ RR_Reflect_X|RR_Reflect_Y, N_(Horizontal and Vertical) }
};
@@ -1516,7 +1516,7 @@ display_settings_dialog_new (GtkBuilder *builder)
combobox = gtk_builder_get_object (builder, randr-rotation);
display_settings_combo_box_create (GTK_COMBO_BOX (combobox));
g_signal_connect (G_OBJECT (combobox), changed, G_CALLBACK
(display_setting_rotations_changed), builder);
-
+
check = gtk_builder_get_object (builder, minimal-autoshow);
xfconf_g_property_bind (display_channel, /Notify, G_TYPE_BOOLEAN, check,
active);
@@ -1772,8 +1772,8 @@ display_settings_show_main_dialog (GdkDisplay *display)
}
static gboolean
-display_settings_minimal_dialog_key_press_event(GtkWidget *widget,
-GdkEventKey *event,
+display_settings_minimal_dialog_key_press_event(GtkWidget *widget,
+GdkEventKey *event,
gpointer user_data)
{
if (event-keyval == GDK_Escape)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master Remember the settings manager window size (bug #9384).
Updating branch refs/heads/master
to b3b1986327b9b42ac6f9442443ff103f6565a323 (commit)
from 4346168db9aba1a9d4878b6ebe9aca41fd898917 (commit)
commit b3b1986327b9b42ac6f9442443ff103f6565a323
Author: Jérôme Guelfucci jero...@xfce.org
Date: Wed Dec 19 09:53:58 2012 +0100
Remember the settings manager window size (bug #9384).
Handy with pluggable dialogs, allows the user to get rid of most of the
scrollbars.
xfce4-settings-manager/Makefile.am |2 +
xfce4-settings-manager/main.c | 13 +++
.../xfce-settings-manager-dialog.c | 38 +++-
3 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/xfce4-settings-manager/Makefile.am
b/xfce4-settings-manager/Makefile.am
index c6bdc2d..99f9b3f 100644
--- a/xfce4-settings-manager/Makefile.am
+++ b/xfce4-settings-manager/Makefile.am
@@ -20,6 +20,7 @@ xfce4_settings_manager_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
$(GARCON_CFLAGS) \
+ $(XFCONF_CFLAGS) \
$(EXO_CFLAGS) \
$(PLATFORM_CFLAGS)
@@ -31,6 +32,7 @@ xfce4_settings_manager_LDADD = \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
+ $(XFCONF_LIBS) \
$(EXO_LIBS) \
$(GARCON_LIBS)
diff --git a/xfce4-settings-manager/main.c b/xfce4-settings-manager/main.c
index 3a65879..42bec66 100644
--- a/xfce4-settings-manager/main.c
+++ b/xfce4-settings-manager/main.c
@@ -28,6 +28,7 @@
#include gtk/gtk.h
#include libxfce4util/libxfce4util.h
#include garcon/garcon.h
+#include xfconf/xfconf.h
#include xfce-settings-manager-dialog.h
@@ -79,6 +80,16 @@ main(int argc,
return EXIT_SUCCESS;
}
+/* initialize xfconf */
+if (G_UNLIKELY (!xfconf_init (error)))
+{
+/* print error and leave */
+g_critical (Failed to connect to Xfconf daemon: %s, error-message);
+g_error_free (error);
+
+return EXIT_FAILURE;
+}
+
garcon_set_environment (XFCE);
dialog = xfce_settings_manager_dialog_new ();
@@ -95,5 +106,7 @@ main(int argc,
gtk_main();
+xfconf_shutdown ();
+
return EXIT_SUCCESS;
}
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c
b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 043b143..39e33ff 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -35,6 +35,7 @@
#include libxfce4util/libxfce4util.h
#include libxfce4ui/libxfce4ui.h
+#include xfconf/xfconf.h
#include garcon/garcon.h
#include exo/exo.h
@@ -55,6 +56,7 @@ struct _XfceSettingsManagerDialog
{
XfceTitledDialog __parent__;
+XfconfChannel *channel;
GarconMenu *menu;
GtkListStore *store;
@@ -156,17 +158,19 @@ xfce_settings_manager_dialog_class_init
(XfceSettingsManagerDialogClass *klass)
static void
xfce_settings_manager_dialog_init (XfceSettingsManagerDialog *dialog)
{
-GtkWidget *scroll;
+GtkWidget *align;
+GtkWidget *bbox;
GtkWidget *dialog_vbox;
-GtkWidget *viewport;
-gchar *path;
-GtkWidget *hbox;
+GtkWidget *ebox;
GtkWidget *entry;
-GtkWidget *align;
-GList *children;
+GtkWidget *hbox;
GtkWidget *header;
-GtkWidget *ebox;
-GtkWidget *bbox;
+GtkWidget *scroll;
+GtkWidget *viewport;
+GList *children;
+gchar *path;
+
+dialog-channel = xfconf_channel_get (xfce4-settings-manager);
dialog-store = gtk_list_store_new (N_COLUMNS,
G_TYPE_STRING,
@@ -180,7 +184,9 @@ xfce_settings_manager_dialog_init
(XfceSettingsManagerDialog *dialog)
dialog-menu = garcon_menu_new_for_path (path != NULL ? path : MENUFILE);
g_free (path);
-gtk_window_set_default_size (GTK_WINDOW (dialog), 640, 500);
+gtk_window_set_default_size (GTK_WINDOW (dialog),
+ xfconf_channel_get_int (dialog-channel, /last/window-width, 640),
+ xfconf_channel_get_int (dialog-channel, /last/window-height, 500));
xfce_settings_manager_dialog_set_title (dialog, NULL, NULL, NULL);
dialog-button_back = xfce_gtk_button_new_mixed (GTK_STOCK_GO_BACK, _(All
_Settings));
@@ -334,6 +340,20 @@ xfce_settings_manager_dialog_response (GtkDialog *widget,
}
else
{
+GdkWindowState state;
+gint width, height;
+
+/* Don't save the state for full-screen windows */
+state = gdk_window_get_state (GTK_WIDGET (widget)-window);
+
+if ((state (GDK_WINDOW_STATE_MAXIMIZED |
GDK_WINDOW_STATE_FULLSCREEN)) == 0)
+{
+/* Save window size */
+gtk_window_get_size (GTK_WINDOW (widget), width, height);
+xfconf_channel_set_int (dialog-channel, /last/window-width,
width),
+xfconf_channel_set_int (dialog-channel, /last/window-height,
height);
+}
+
[Xfce4-commits] xfce4-weather-plugin:master Summary window: Add tooltips to forecast cells.
Updating branch refs/heads/master
to 2f811dd18c8337992281eaa0059018663d9eccf0 (commit)
from 93f1c3705abf0a910902a5d79a8c317759e6a477 (commit)
commit 2f811dd18c8337992281eaa0059018663d9eccf0
Author: Harald Judt h.j...@gmx.at
Date: Sun Dec 16 03:36:52 2012 +0100
Summary window: Add tooltips to forecast cells.
panel-plugin/weather-summary.c | 65
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index 5b01319..8fce6f3 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -83,6 +83,14 @@ lnk_clicked(GtkTextTag *tag,
add_forecast_header(title, 0.0, darkbg), \
pos, pos+1, 0, 1); \
+#define APPEND_TOOLTIP_ITEM(description, item) \
+value = get_data(fcdata, data-units, item, data-round); \
+unit = get_unit(data-units, item); \
+g_string_append_printf(text, description, value,\
+ strcmp(unit, °) ? : ,\
+ unit); \
+g_free(value);
+
static gboolean
lnk_clicked(GtkTextTag *tag,
@@ -270,6 +278,18 @@ weather_summary_get_logo(plugin_data *data)
}
+static gchar *
+format_date(time_t t)
+{
+struct tm *tm;
+gchar buf[80];
+
+tm = localtime(t);
+strftime(buf, 80, %c, tm);
+return g_strdup(buf);
+}
+
+
static GtkWidget *
create_summary_tab(plugin_data *data)
{
@@ -509,6 +529,47 @@ get_dayname(gint day)
}
+static gchar *
+forecast_cell_get_tooltip_text(plugin_data *data,
+ xml_time *fcdata)
+{
+GString *text;
+gchar *result, *value;
+const gchar *unit;
+
+/* TRANSLATORS: Please use \t as needed to properly align the values */
+text = g_string_new(_(bTimes used for calculation/b\n));
+value = format_date(fcdata-start);
+g_string_append_printf(text, _(Interval start:\t\t\t%s\n), value);
+g_free(value);
+value = format_date(fcdata-end);
+g_string_append_printf(text, _(Interval end:\t\t\t%s\n), value);
+g_free(value);
+value = format_date(fcdata-point);
+g_string_append_printf(text, _(Data calculated for:\t%s\n\n), value);
+g_free(value);
+
+g_string_append(text, _(bAtmosphere/b\n));
+APPEND_TOOLTIP_ITEM(_(Pressure:\t%s%s%s\n), PRESSURE);
+APPEND_TOOLTIP_ITEM(_(Humidity:\t%s%s%s\n\n), HUMIDITY);
+
+g_string_append(text, _(bPrecipitations/b\n));
+APPEND_TOOLTIP_ITEM(_(Amount:\t\t%s%s%s\n\n), PRECIPITATIONS);
+
+g_string_append(text, _(bClouds/b\n));
+APPEND_TOOLTIP_ITEM(_(Fog:\t\t%s%s%s\n), FOG);
+APPEND_TOOLTIP_ITEM(_(Low:\t\t%s%s%s\n), CLOUDS_LOW);
+APPEND_TOOLTIP_ITEM(_(Medium\t\t%s%s%s\n), CLOUDS_MED);
+APPEND_TOOLTIP_ITEM(_(High:\t\t%s%s%s\n), CLOUDS_HIGH);
+APPEND_TOOLTIP_ITEM(_(Cloudiness:\t%s%s%s), CLOUDINESS);
+
+/* Free GString only and return its character data */
+result = text-str;
+g_string_free(text, FALSE);
+return result;
+}
+
+
static GtkWidget *
wrap_forecast_cell(const GtkWidget *widget,
const GdkColor *color)
@@ -623,6 +684,10 @@ add_forecast_cell(plugin_data *data,
gtk_widget_set_size_request(GTK_WIDGET(box), 150, -1);
+value = forecast_cell_get_tooltip_text(data, fcdata);
+gtk_widget_set_tooltip_markup(GTK_WIDGET(box), value);
+g_free(value);
+
xml_time_free(fcdata);
return box;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Summary window: Add date of last update to details tab (bug #9499).
Updating branch refs/heads/master
to 15950e3ecd0c9f8df1ff2e71af9c4196b434884f (commit)
from 2f811dd18c8337992281eaa0059018663d9eccf0 (commit)
commit 15950e3ecd0c9f8df1ff2e71af9c4196b434884f
Author: Harald Judt h.j...@gmx.at
Date: Sun Dec 16 12:02:59 2012 +0100
Summary window: Add date of last update to details tab (bug #9499).
panel-plugin/weather-data.c| 25
panel-plugin/weather-data.h|4 ++
panel-plugin/weather-debug.c | 41 --
panel-plugin/weather-debug.h |2 -
panel-plugin/weather-summary.c | 60 +--
panel-plugin/weather.c | 52 ++
6 files changed, 84 insertions(+), 100 deletions(-)
diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
index c23eec1..4043030 100644
--- a/panel-plugin/weather-data.c
+++ b/panel-plugin/weather-data.c
@@ -75,6 +75,31 @@ string_to_double(const gchar *str,
}
+gchar *
+format_date(const time_t date_t,
+gchar *format,
+gboolean local)
+{
+struct tm *tm;
+time_t t = date_t;
+gchar buf[40];
+size_t size;
+
+if (G_LIKELY(local))
+tm = localtime(t);
+else
+tm = gmtime(t);
+
+/* A year = 1970 means date has not been set */
+if (G_UNLIKELY(tm == NULL) || tm-tm_year = 70)
+return g_strdup(-);
+if (format == NULL)
+format = %Y-%m-%d %H:%M:%S;
+size = strftime(buf, 40, format, tm);
+return (size ? g_strdup(buf) : g_strdup(-));
+}
+
+
/* check whether timeslice is interval or point data */
gboolean
timeslice_is_interval(xml_time *timeslice)
diff --git a/panel-plugin/weather-data.h b/panel-plugin/weather-data.h
index 7eff287..d0115b8 100644
--- a/panel-plugin/weather-data.h
+++ b/panel-plugin/weather-data.h
@@ -90,6 +90,10 @@ typedef struct {
gdouble string_to_double(const gchar *str,
gdouble backup);
+gchar *format_date(const time_t t,
+ gchar *format,
+ gboolean local);
+
gboolean timeslice_is_interval(xml_time *timeslice);
gchar *get_data(const xml_time *timeslice,
diff --git a/panel-plugin/weather-debug.c b/panel-plugin/weather-debug.c
index 3fe0677..5fb6b50 100644
--- a/panel-plugin/weather-debug.c
+++ b/panel-plugin/weather-debug.c
@@ -29,8 +29,6 @@
#include weather-debug.h
-#define INVALID_TIME INVALID
-
#define YESNO(bool) ((bool) ? yes : no)
@@ -110,19 +108,6 @@ weather_debug_real(const gchar *log_domain,
gchar *
-weather_debug_strftime_t(const time_t t)
-{
-struct tm tm;
-gchar str[20];
-size_t size;
-
-tm = *localtime(t);
-size = strftime(str, 20, %Y-%m-%d %H:%M:%S, tm);
-return (size ? g_strdup(str) : g_strdup(INVALID_TIME));
-}
-
-
-gchar *
weather_dump_geolocation(const xml_geolocation *geo)
{
gchar *out;
@@ -230,10 +215,10 @@ weather_dump_astrodata(const xml_astro *astro)
if (!astro)
return g_strdup(No astronomical data.);
-sunrise = weather_debug_strftime_t(astro-sunrise);
-sunset = weather_debug_strftime_t(astro-sunset);
-moonrise = weather_debug_strftime_t(astro-moonrise);
-moonset = weather_debug_strftime_t(astro-moonset);
+sunrise = format_date(astro-sunrise, %c, TRUE);
+sunset = format_date(astro-sunset, %c, TRUE);
+moonrise = format_date(astro-moonrise, %c, TRUE);
+moonset = format_date(astro-moonset, %c, TRUE);
out = g_strdup_printf(Astronomical data:\n
\n
@@ -349,8 +334,8 @@ weather_dump_timeslice(const xml_time *timeslice)
return g_strdup(No timeslice data.);
out = g_string_sized_new(512);
-start = weather_debug_strftime_t(timeslice-start);
-end = weather_debug_strftime_t(timeslice-end);
+start = format_date(timeslice-start, %c, TRUE);
+end = format_date(timeslice-end, %c, TRUE);
is_interval = (gboolean) strcmp(start, end);
loc = weather_dump_location((timeslice) ? timeslice-location : NULL,
is_interval);
@@ -411,15 +396,15 @@ weather_dump_plugindata(const plugin_data *data)
gchar *next_astro_update, *next_weather_update, *next_conditions_update;
gchar *next_wakeup, *result;
-last_astro_update = weather_debug_strftime_t(data-astro_update-last);
-last_weather_update = weather_debug_strftime_t(data-weather_update-last);
+last_astro_update = format_date(data-astro_update-last, %c, TRUE);
+last_weather_update = format_date(data-weather_update-last, %c, TRUE);
last_conditions_update =
-weather_debug_strftime_t(data-conditions_update-last);
-next_astro_update = weather_debug_strftime_t(data-astro_update-next);
-next_weather_update = weather_debug_strftime_t(data-weather_update-next);
+format_date(data-conditions_update-last, %c, TRUE);
+next_astro_update = format_date(data-astro_update-next, %c, TRUE);
+
[Xfce4-commits] xfce4-weather-plugin:master Time for more fog.
Updating branch refs/heads/master
to 5c0fd23d5b86114bba33bfd5eb798f0313dcadae (commit)
from a20c1e82b8ddfc3bafa423ec48602916ea3e571c (commit)
commit 5c0fd23d5b86114bba33bfd5eb798f0313dcadae
Author: Harald Judt h.j...@gmx.at
Date: Wed Dec 19 09:03:40 2012 +0100
Time for more fog.
It seems met.no doesn't use the FOG symbol at all?
Let's try to safely make use of it by analysing the fog value
and the other values, and choose it if it seems right to do so
(it's still low priority, but not that much low priority as
before).
panel-plugin/weather-data.c |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
index 8f984db..fb31f35 100644
--- a/panel-plugin/weather-data.c
+++ b/panel-plugin/weather-data.c
@@ -433,7 +433,7 @@ static void
calculate_symbol(xml_time *timeslice)
{
xml_location *loc;
-gdouble cloudiness, precipitation;
+gdouble fog, cloudiness, precipitation;
g_assert(timeslice != NULL timeslice-location != NULL);
if (G_UNLIKELY(timeslice == NULL || timeslice-location == NULL))
@@ -454,6 +454,10 @@ calculate_symbol(xml_time *timeslice)
else if (cloudiness = 1.0 / 8.0)
loc-symbol_id = SYMBOL_LIGHTCLOUD;
+fog = string_to_double(loc-fog_percent, 0);
+if (fog = 80)
+loc-symbol_id = SYMBOL_FOG;
+
/* update symbol name */
g_free(loc-symbol);
loc-symbol = g_strdup(symbol_by_id(loc-symbol_id));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Modify the symbol according to calculated point data.
Updating branch refs/heads/master
to a20c1e82b8ddfc3bafa423ec48602916ea3e571c (commit)
from 15950e3ecd0c9f8df1ff2e71af9c4196b434884f (commit)
commit a20c1e82b8ddfc3bafa423ec48602916ea3e571c
Author: Harald Judt h.j...@gmx.at
Date: Sun Dec 16 15:32:34 2012 +0100
Modify the symbol according to calculated point data.
Since we're interpolating data for both current conditions and
forecast, let's adapt the symbol a bit to better match the values
at the time chosen. This way the values make more sense, and
to keep as close as possible to the original data, only the
amount of clouds (lightly cloudy, partly cloudy, cloudy) is
changed.
panel-plugin/weather-data.c | 91 +++
1 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
index 4043030..8f984db 100644
--- a/panel-plugin/weather-data.c
+++ b/panel-plugin/weather-data.c
@@ -55,6 +55,33 @@
comb-location-var = g_strdup(end-location-var);
+enum {
+SYMBOL_NODATA = 0,
+SYMBOL_SUN,
+SYMBOL_LIGHTCLOUD,
+SYMBOL_PARTLYCLOUD,
+SYMBOL_CLOUD,
+SYMBOL_LIGHTRAINSUN,
+SYMBOL_LIGHTRAINTHUNDERSUN,
+SYMBOL_SLEETSUN,
+SYMBOL_SNOWSUN,
+SYMBOL_LIGHTRAIN,
+SYMBOL_RAIN,
+SYMBOL_RAINTHUNDER,
+SYMBOL_SLEET,
+SYMBOL_SNOW,
+SYMBOL_SNOWTHUNDER,
+SYMBOL_FOG,
+SYMBOL_SUN_POLAR,
+SYMBOL_LIGHTCLOUD_POLAR,
+SYMBOL_LIGHTRAINSUN_POLAR,
+SYMBOL_SNOWSUN_POLAR,
+SYMBOL_SLEETSUNTHUNDER,
+SYMBOL_SNOWSUNTHUNDER,
+SYMBOL_LIGHTRAINTHUNDER,
+SYMBOL_SLEETTHUNDER
+};
+
/* struct to store results from searches for point data */
typedef struct {
GArray *before;
@@ -370,6 +397,69 @@ wind_dir_name_by_deg(gchar *degrees, gboolean long_name)
}
+static const gchar *
+symbol_by_id(const gint symbol_id)
+{
+switch (symbol_id) {
+case SYMBOL_SUN: return SUN;
+case SYMBOL_LIGHTCLOUD: return LIGHTCLOUD;
+case SYMBOL_PARTLYCLOUD: return PARTLYCLOUD;
+case SYMBOL_CLOUD:return CLOUD;
+case SYMBOL_LIGHTRAINSUN: return LIGHTRAINSUN;
+case SYMBOL_LIGHTRAINTHUNDERSUN: return LIGHTRAINTHUNDERSUN;
+case SYMBOL_SLEETSUN: return SLEETSUN;
+case SYMBOL_SNOWSUN: return SNOWSUN;
+case SYMBOL_LIGHTRAIN:return LIGHTRAIN;
+case SYMBOL_RAIN: return RAIN;
+case SYMBOL_RAINTHUNDER: return RAINTHUNDER;
+case SYMBOL_SLEET:return SLEET;
+case SYMBOL_SNOW: return SNOW;
+case SYMBOL_SNOWTHUNDER: return SNOWTHUNDER;
+case SYMBOL_FOG: return FOG;
+case SYMBOL_SUN_POLAR:return SUN;
+case SYMBOL_LIGHTCLOUD_POLAR: return LIGHTCLOUD;
+case SYMBOL_LIGHTRAINSUN_POLAR: return LIGHTRAINSUN;
+case SYMBOL_SNOWSUN_POLAR:return SNOWSUN;
+case SYMBOL_SLEETSUNTHUNDER: return SLEETSUNTHUNDER;
+case SYMBOL_SNOWSUNTHUNDER: return SLEETSUNTHUNDER;
+case SYMBOL_LIGHTRAINTHUNDER: return LIGHTRAINTHUNDER;
+case SYMBOL_SLEETTHUNDER: return SLEETTHUNDER;
+default: return ;
+}
+}
+
+
+static void
+calculate_symbol(xml_time *timeslice)
+{
+xml_location *loc;
+gdouble cloudiness, precipitation;
+
+g_assert(timeslice != NULL timeslice-location != NULL);
+if (G_UNLIKELY(timeslice == NULL || timeslice-location == NULL))
+return;
+
+loc = timeslice-location;
+
+precipitation = string_to_double(loc-precipitation_value, 0);
+if (precipitation 0)
+return;
+
+cloudiness =
+string_to_double(loc-clouds_percent[CLOUDS_PERC_CLOUDINESS], 0);
+if (cloudiness = 90)
+loc-symbol_id = SYMBOL_CLOUD;
+else if (cloudiness = 30)
+loc-symbol_id = SYMBOL_PARTLYCLOUD;
+else if (cloudiness = 1.0 / 8.0)
+loc-symbol_id = SYMBOL_LIGHTCLOUD;
+
+/* update symbol name */
+g_free(loc-symbol);
+loc-symbol = g_strdup(symbol_by_id(loc-symbol_id));
+}
+
+
/*
* Interpolate data for a certain time in a given interval
*/
@@ -518,6 +608,7 @@ make_combined_timeslice(xml_weather *wd,
comb-location-symbol_id = interval-location-symbol_id;
comb-location-symbol = g_strdup(interval-location-symbol);
+calculate_symbol(comb);
return comb;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Summary window: Reformat report in details tab.
Updating branch refs/heads/master
to 77788b6b254142ceaf57e6fc65374132a14a7a26 (commit)
from 5c0fd23d5b86114bba33bfd5eb798f0313dcadae (commit)
commit 77788b6b254142ceaf57e6fc65374132a14a7a26
Author: Harald Judt h.j...@gmx.at
Date: Wed Dec 19 11:14:47 2012 +0100
Summary window: Reformat report in details tab.
Use tabs to align times and dates and use Weather Report instead of
Weather Update as window subtitle. Remove all other occurrences of
Weather report for, as these are just unnecessary repetitions.
panel-plugin/weather-summary.c | 31 ++-
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index d2b2a5b..6c51bc4 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -325,18 +325,14 @@ create_summary_tab(plugin_data *data)
ltag1 = gtk_text_buffer_create_tag(buffer, lnk1,
foreground-gdk, lnk_color, NULL);
-/* head */
-value = g_strdup_printf(_(Weather report for: %s.\n\n),
-data-location_name);
-APPEND_BTEXT(value);
-g_free(value);
-
conditions = get_current_conditions(data-weatherdata);
APPEND_BTEXT(_(Coordinates\n));
APPEND_TEXT_ITEM(_(Altitude), ALTITUDE);
APPEND_TEXT_ITEM(_(Latitude), LATITUDE);
APPEND_TEXT_ITEM(_(Longitude), LONGITUDE);
+/* TRANSLATORS: Please use as many \t as appropriate to align the
+ date/time values as in the original. */
APPEND_BTEXT(_(\nTime\n));
last_weather_update = format_date(data-weather_update-last, NULL, TRUE);
value = g_strdup_printf(_(\tLast updated:\t%s\n\n),
@@ -346,7 +342,8 @@ create_summary_tab(plugin_data *data)
point = format_date(conditions-point, NULL, TRUE);
value = g_strdup_printf
-(_(\tTemperature, wind, atmosphere and cloud data calculated
for:\n\t%s\n),
+(_(\tTemperature, wind, atmosphere and cloud data calculated\n
+ \tfor:\t\t\t%s\n),
point);
g_free(point);
APPEND_TEXT_ITEM_REAL(value);
@@ -355,9 +352,9 @@ create_summary_tab(plugin_data *data)
interval_end = format_date(conditions-end, NULL, TRUE);
value = g_strdup_printf
(_(\n\tPrecipitation and the weather symbol have been calculated\n
- \tfor the following time interval:\n
- \tStart:\t%s\n
- \tEnd:\t%s\n),
+ \tusing the following time interval:\n
+ \tStart:\t\t%s\n
+ \tEnd:\t\t%s\n),
interval_start,
interval_end);
g_free(interval_end);
@@ -394,10 +391,12 @@ create_summary_tab(plugin_data *data)
APPEND_TEXT_ITEM_REAL(value);
if (data-astrodata-moon_never_rises) {
-value = g_strdup(_(\tMoonrise:\tThe moon never rises today.\n));
+value =
+g_strdup(_(\tMoonrise:\tThe moon never rises today.\n));
APPEND_TEXT_ITEM_REAL(value);
} else if (data-astrodata-moon_never_sets) {
-value = g_strdup(_(\tMoonset:\tThe moon never sets today.\n));
+value =
+g_strdup(_(\tMoonset:\tThe moon never sets today.\n));
APPEND_TEXT_ITEM_REAL(value);
} else {
moonrise = format_date(data-astrodata-moonrise, NULL, TRUE);
@@ -861,14 +860,14 @@ create_summary_window(plugin_data *data)
GdkPixbuf *icon;
xml_time *conditions;
-window = xfce_titled_dialog_new_with_buttons(_(Weather Update),
+conditions = get_current_conditions(data-weatherdata);
+window = xfce_titled_dialog_new_with_buttons(_(Weather Report),
NULL,
GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CLOSE,
GTK_RESPONSE_ACCEPT, NULL);
if (data-location_name != NULL) {
-title = g_strdup_printf(_(Weather report for: %s),
-data-location_name);
+title = g_strdup_printf(%s, data-location_name);
xfce_titled_dialog_set_subtitle(XFCE_TITLED_DIALOG(window), title);
g_free(title);
}
@@ -876,8 +875,6 @@ create_summary_window(plugin_data *data)
vbox = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)-vbox), vbox, TRUE, TRUE, 0);
-conditions = get_current_conditions(data-weatherdata);
-
symbol = get_data(conditions, data-units, SYMBOL, FALSE);
icon = get_icon(data-icon_theme, symbol, 48, data-night_time);
g_free(symbol);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix screensaver bug (7407). Thanks Tekk
Updating branch refs/heads/master
to 6d836941fb5c382e4338fd00bf993ffbd6959e89 (commit)
from f59afa18f12be9aead59324f50f2e91d832b17c6 (commit)
commit 6d836941fb5c382e4338fd00bf993ffbd6959e89
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 19 05:44:05 2012 -0500
Fix screensaver bug (7407). Thanks Tekk
src/common/parole-screensaver.c | 51 +--
src/common/parole-screensaver.h |8 ++
src/parole-player.c |8 +++---
3 files changed, 24 insertions(+), 43 deletions(-)
diff --git a/src/common/parole-screensaver.c b/src/common/parole-screensaver.c
index 1f35fff..880785e 100644
--- a/src/common/parole-screensaver.c
+++ b/src/common/parole-screensaver.c
@@ -37,23 +37,12 @@
#define PAROLE_SCREEN_SAVER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_SCREENSAVER,
ParoleScreenSaverPrivate))
-struct ParoleScreenSaverPrivate
-{
-gulong reset_id;
-};
-
G_DEFINE_TYPE (ParoleScreenSaver, parole_screen_saver, G_TYPE_OBJECT)
static void
parole_screen_saver_finalize (GObject *object)
{
-ParoleScreenSaver *saver;
-
-saver = PAROLE_SCREEN_SAVER (object);
-
-parole_screen_saver_uninhibit (saver);
-
G_OBJECT_CLASS (parole_screen_saver_parent_class)-finalize (object);
}
@@ -64,22 +53,12 @@ parole_screen_saver_class_init (ParoleScreenSaverClass
*klass)
object_class-finalize = parole_screen_saver_finalize;
-g_type_class_add_private (klass, sizeof (ParoleScreenSaverPrivate));
}
static void
parole_screen_saver_init (ParoleScreenSaver *saver)
{
-saver-priv = PAROLE_SCREEN_SAVER_GET_PRIVATE (saver);
-
-saver-priv-reset_id = 0;
-}
-
-static gboolean
-parole_screen_saver_reset_timeout (gpointer data)
-{
-XResetScreenSaver (GDK_DISPLAY ());
-return TRUE;
+return;
}
ParoleScreenSaver *
@@ -90,24 +69,28 @@ parole_screen_saver_new (void)
return saver;
}
-void parole_screen_saver_inhibit (ParoleScreenSaver *saver)
+void parole_screen_saver_inhibit (ParoleScreenSaver *saver, GtkWindow *window)
{
-g_return_if_fail (PAROLE_IS_SCREENSAVER (saver));
+gchar *cmd;
-parole_screen_saver_uninhibit (saver);
+g_return_if_fail (PAROLE_IS_SCREENSAVER (saver));
-saver-priv-reset_id = g_timeout_add_seconds (RESET_SCREENSAVER_TIMEOUT,
- (GSourceFunc)
parole_screen_saver_reset_timeout,
- NULL);
+cmd = g_strdup_printf(xdg-screensaver suspend %d,
(int)GDK_WINDOW_XID(GDK_WINDOW(GTK_WIDGET(window)-window)));
+//cmd = g_strdup_printf(xdg-screensaver suspend %d,
(int)GDK_WINDOW_XID(GDK_WINDOW(
gtk_widget_get_parent_window(GTK_WIDGET(window)) )));
+system(cmd);
+
+g_free(cmd);
}
-void parole_screen_saver_uninhibit (ParoleScreenSaver *saver)
+void parole_screen_saver_uninhibit (ParoleScreenSaver *saver, GtkWindow
*window)
{
+gchar *cmd;
+
g_return_if_fail (PAROLE_IS_SCREENSAVER (saver));
-if ( saver-priv-reset_id != 0 )
-{
- g_source_remove (saver-priv-reset_id);
- saver-priv-reset_id = 0;
-}
+cmd = g_strdup_printf(xdg-screensaver resume %d,
(int)GDK_WINDOW_XID(GDK_WINDOW(GTK_WIDGET(window)-window)));
+//cmd = g_strdup_printf(xdg-screensaver resume %d,
(int)GDK_WINDOW_XID(GDK_WINDOW(
gtk_widget_get_parent_window(GTK_WIDGET(window)) )));
+system(cmd);
+
+g_free(cmd);
}
diff --git a/src/common/parole-screensaver.h b/src/common/parole-screensaver.h
index 8fe6f1f..c4188c0 100644
--- a/src/common/parole-screensaver.h
+++ b/src/common/parole-screensaver.h
@@ -22,6 +22,7 @@
#define __PAROLE_SCREEN_SAVER_H
#include glib-object.h
+#include gtk/gtk.h
G_BEGIN_DECLS
@@ -29,12 +30,9 @@ G_BEGIN_DECLS
#define PAROLE_SCREEN_SAVER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
PAROLE_TYPE_SCREENSAVER, ParoleScreenSaver))
#define PAROLE_IS_SCREENSAVER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o),
PAROLE_TYPE_SCREENSAVER))
-typedef struct ParoleScreenSaverPrivate ParoleScreenSaverPrivate;
-
typedef struct
{
GObject parent;
-ParoleScreenSaverPrivate *priv;
} ParoleScreenSaver;
@@ -47,9 +45,9 @@ typedef struct
GTypeparole_screen_saver_get_type(void)
G_GNUC_CONST;
ParoleScreenSaver *parole_screen_saver_new (void);
-void parole_screen_saver_inhibit
(ParoleScreenSaver *saver);
+void parole_screen_saver_inhibit
(ParoleScreenSaver *saver, GtkWindow *window);
-void parole_screen_saver_uninhibit
(ParoleScreenSaver *saver);
+void parole_screen_saver_uninhibit
(ParoleScreenSaver *saver, GtkWindow *window);
G_END_DECLS
diff --git a/src/parole-player.c b/src/parole-player.c
index 49dd235..6d6b651 100644
---
[Xfce4-commits] thunar:xfce-4.10 l10n: Updated Bulgarian (bg) translation to 3%
Updating branch refs/heads/xfce-4.10 to f11abacba2cdacc35e8ef8d4546713ac894db4f0 (commit) from f2bb5680918086b24ae547566cd252b6569c57b6 (commit) commit f11abacba2cdacc35e8ef8d4546713ac894db4f0 Author: Kiril Kirilov cybercop_mont...@abv.bg Date: Wed Dec 19 11:51:30 2012 +0100 l10n: Updated Bulgarian (bg) translation to 3% New status: 22 messages complete with 0 fuzzies and 659 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/bg.po | 108 ++ 1 files changed, 52 insertions(+), 56 deletions(-) diff --git a/po/bg.po b/po/bg.po index d5d8af6..4e07bd7 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2,28 +2,28 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR EMAIL@ADDRESS, YEAR. -# +# #, fuzzy msgid msgstr Project-Id-Version: 1.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-05-03 21:43+\n +POT-Creation-Date: 2012-12-19 06:12+\n PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n Last-Translator: FULL NAME EMAIL@ADDRESS\n Language-Team: Bulgarian b...@li.org\n -Language: bg\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: bg\n #: ../thunar/main.c:62 msgid Open the bulk rename dialog -msgstr +msgstr Отвори диалог за масово преименуване #: ../thunar/main.c:64 msgid Run in daemon mode -msgstr +msgstr Стартирай в #: ../thunar/main.c:66 msgid Run in daemon mode (not supported) @@ -39,89 +39,89 @@ msgstr #: ../thunar/main.c:74 msgid Print version information and exit -msgstr +msgstr Отпечатай информацията за версията о излез #. setup application name #: ../thunar/main.c:128 msgid Thunar -msgstr +msgstr Файлов мениджър /Thunar/ #. initialize Gtk+ #: ../thunar/main.c:145 msgid [FILES...] -msgstr +msgstr [файлове...] #: ../thunar/main.c:152 #, c-format msgid Thunar: Failed to open display: %s\n -msgstr +msgstr Файлов мениджър /Thunar/ : Неуспех при показване : %s\n #. yep, there's an error, so print it #: ../thunar/main.c:157 #, c-format msgid Thunar: %s\n -msgstr +msgstr Файлов мениджър /Thunar/ : %s\n #: ../thunar/main.c:168 msgid The Thunar development team. All rights reserved. -msgstr +msgstr Екипът по разработката на Thunar. Всички права са запазени. #: ../thunar/main.c:169 msgid Written by Benedikt Meurer be...@xfce.org. -msgstr +msgstr Написано от Benedikt Meurer be...@xfce.org. #: ../thunar/main.c:170 #, c-format msgid Please report bugs to %s. -msgstr +msgstr Моля, докладвайте грешките в %s. #: ../thunar/thunar-abstract-icon-view.c:115 msgid Arran_ge Items -msgstr +msgstr Подреди изброените #: ../thunar/thunar-abstract-icon-view.c:120 msgid Sort By _Name -msgstr +msgstr Подреди по имена #: ../thunar/thunar-abstract-icon-view.c:120 msgid Keep items sorted by their name -msgstr +msgstr Запази изброените, сортирани по техните имена #: ../thunar/thunar-abstract-icon-view.c:121 msgid Sort By _Size -msgstr +msgstr Подреди по размер #: ../thunar/thunar-abstract-icon-view.c:121 msgid Keep items sorted by their size -msgstr +msgstr Запази изброените, подредени по техният размер #: ../thunar/thunar-abstract-icon-view.c:122 msgid Sort By _Type -msgstr +msgstr Подреди по вид #: ../thunar/thunar-abstract-icon-view.c:122 msgid Keep items sorted by their type -msgstr +msgstr Запази изброените, подредени по вид #: ../thunar/thunar-abstract-icon-view.c:123 msgid Sort By Modification _Date -msgstr +msgstr Подреди по дата на промяна #: ../thunar/thunar-abstract-icon-view.c:123 msgid Keep items sorted by their modification date -msgstr +msgstr Запази изброените, подредени по дата на промяна #: ../thunar/thunar-abstract-icon-view.c:128 msgid _Ascending -msgstr +msgstr Възходящ ред #: ../thunar/thunar-abstract-icon-view.c:128 msgid Sort items in ascending order -msgstr +msgstr Подреди изброените по възходящ ред #: ../thunar/thunar-abstract-icon-view.c:129 msgid _Descending -msgstr +msgstr Низходящ ред #: ../thunar/thunar-abstract-icon-view.c:129 msgid Sort items in descending order @@ -663,9 +663,8 @@ msgstr msgid ReplaceDialogPart1|Do you want to replace the existing file msgstr -#. #. Fourth box (size, volume, free space) -#. +#. #: ../thunar/thunar-dialogs.c:587 ../thunar/thunar-dialogs.c:618 #: ../thunar/thunar-properties-dialog.c:418 msgid Size: @@ -746,9 +745,8 @@ msgstr msgid Owner msgstr -#. #. Permissions chooser -#. +#. #: ../thunar/thunar-enum-types.c:121 ../thunar/thunar-properties-dialog.c:491 msgid Permissions msgstr @@ -1133,10 +1131,12 @@ msgstr msgid \%s\ (%s) %s msgstr -#. TRANSLATORS: Try to come up with a short translation of Original Path (which is the path -#. * where the trashed file/folder was located before it was moved to the trash), otherwise the +#.
[Xfce4-commits] thunar:xfce-4.10 l10n: Updated Bulgarian (bg) translation to None%
Updating branch refs/heads/xfce-4.10 to 8bd0d86770d5b589aa71cfb80ba74a5dec4f15fd (commit) from f11abacba2cdacc35e8ef8d4546713ac894db4f0 (commit) commit 8bd0d86770d5b589aa71cfb80ba74a5dec4f15fd Author: Kiril Kirilov cybercop_mont...@abv.bg Date: Wed Dec 19 12:37:52 2012 +0100 l10n: Updated Bulgarian (bg) translation to None% New status: 0 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/bg.po | 149 ++ 1 files changed, 91 insertions(+), 58 deletions(-) diff --git a/po/bg.po b/po/bg.po index 4e07bd7..3214271 100644 --- a/po/bg.po +++ b/po/bg.po @@ -18,8 +18,9 @@ msgstr Language: bg\n #: ../thunar/main.c:62 +#, fuzzy msgid Open the bulk rename dialog -msgstr Отвори диалог за масово преименуване +msgstr Стартиране в режим \Демон\ /Не се поддържа/ #: ../thunar/main.c:64 msgid Run in daemon mode @@ -30,98 +31,118 @@ msgid Run in daemon mode (not supported) msgstr #: ../thunar/main.c:70 +#, fuzzy msgid Quit a running Thunar instance -msgstr +msgstr Подреди избраните по низходящ ред #: ../thunar/main.c:72 +#, fuzzy msgid Quit a running Thunar instance (not supported) -msgstr +msgstr Невъзможно е да се осъществи това действие #: ../thunar/main.c:74 +#, fuzzy msgid Print version information and exit -msgstr Отпечатай информацията за версията о излез +msgstr Не може да се отвори \%s\ #. setup application name #: ../thunar/main.c:128 +#, fuzzy msgid Thunar -msgstr Файлов мениджър /Thunar/ +msgstr Не може да се отвори \%s\: %s #. initialize Gtk+ #: ../thunar/main.c:145 +#, fuzzy msgid [FILES...] -msgstr [файлове...] +msgstr Не може да бъде преименуван \%s\ #: ../thunar/main.c:152 -#, c-format +#, c-format, fuzzy msgid Thunar: Failed to open display: %s\n -msgstr Файлов мениджър /Thunar/ : Неуспех при показване : %s\n +msgstr Нова папка #. yep, there's an error, so print it #: ../thunar/main.c:157 -#, c-format +#, c-format, fuzzy msgid Thunar: %s\n -msgstr Файлов мениджър /Thunar/ : %s\n +msgstr Създай нова директория #: ../thunar/main.c:168 +#, fuzzy msgid The Thunar development team. All rights reserved. -msgstr Екипът по разработката на Thunar. Всички права са запазени. +msgstr Нов файл #: ../thunar/main.c:169 +#, fuzzy msgid Written by Benedikt Meurer be...@xfce.org. -msgstr Написано от Benedikt Meurer be...@xfce.org. +msgstr Създай нов файл #: ../thunar/main.c:170 -#, c-format +#, c-format, fuzzy msgid Please report bugs to %s. -msgstr Моля, докладвайте грешките в %s. +msgstr Създаване на документ от шаблон #: ../thunar/thunar-abstract-icon-view.c:115 +#, fuzzy msgid Arran_ge Items -msgstr Подреди изброените +msgstr Копиране на файлове ... #: ../thunar/thunar-abstract-icon-view.c:120 +#, fuzzy msgid Sort By _Name -msgstr Подреди по имена +msgstr Копираране на файловете в \%s\... #: ../thunar/thunar-abstract-icon-view.c:120 +#, fuzzy msgid Keep items sorted by their name -msgstr Запази изброените, сортирани по техните имена +msgstr Създаване на символни връзки в \%s\... #: ../thunar/thunar-abstract-icon-view.c:121 +#, fuzzy msgid Sort By _Size -msgstr Подреди по размер +msgstr Премести файловете в \%s\... #: ../thunar/thunar-abstract-icon-view.c:121 +#, fuzzy msgid Keep items sorted by their size -msgstr Запази изброените, подредени по техният размер +msgstr Сигурни ли сте, че искате да изтриете \%s\? #: ../thunar/thunar-abstract-icon-view.c:122 +#, fuzzy msgid Sort By _Type -msgstr Подреди по вид +msgstr[0] Сигурен ли сте, че искате да изтриете избраните файлове ? +msgstr[1] Сигурен ли сте, че искате да изтриете %u избрани файлове ? #: ../thunar/thunar-abstract-icon-view.c:122 +#, fuzzy msgid Keep items sorted by their type -msgstr Запази изброените, подредени по вид +msgstr Ако изтриете файловете, те ще бъдат изгубени завинаги ! #: ../thunar/thunar-abstract-icon-view.c:123 +#, fuzzy msgid Sort By Modification _Date -msgstr Подреди по дата на промяна +msgstr Изтриване на файлове... #: ../thunar/thunar-abstract-icon-view.c:123 +#, fuzzy msgid Keep items sorted by their modification date -msgstr Запази изброените, подредени по дата на промяна +msgstr Преместване на файловете в кошчето... #: ../thunar/thunar-abstract-icon-view.c:128 +#, fuzzy msgid _Ascending -msgstr Възходящ ред +msgstr Създаване на файлове... #: ../thunar/thunar-abstract-icon-view.c:128 +#, fuzzy msgid Sort items in ascending order -msgstr Подреди изброените по възходящ ред +msgstr Създаване на директории #: ../thunar/thunar-abstract-icon-view.c:129 +#, fuzzy msgid _Descending -msgstr Низходящ ред +msgstr Искате ли да премахнете всички файлове и папки от кошчето ? #: ../thunar/thunar-abstract-icon-view.c:129 msgid Sort items in descending order @@ -246,117 +267,129 @@ msgstr #: ../thunar/thunar-application.c:1947 ../thunar/thunar-location-buttons.c:171 #:
[Xfce4-commits] xfce4-settings:master l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to 2702e5ae13e79f4b9d8be826ff7ca710f9fd7434 (commit) from b3b1986327b9b42ac6f9442443ff103f6565a323 (commit) commit 2702e5ae13e79f4b9d8be826ff7ca710f9fd7434 Author: Masato Hashimoto hash...@xfce.org Date: Wed Dec 19 14:34:24 2012 +0100 l10n: Updated Japanese (ja) translation to 100% New status: 349 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 80 ++ 1 files changed, 44 insertions(+), 36 deletions(-) diff --git a/po/ja.po b/po/ja.po index 66e2012..0f3c7de 100644 --- a/po/ja.po +++ b/po/ja.po @@ -19,10 +19,10 @@ msgid msgstr Project-Id-Version: xfce 4-settings 4.5.90\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-11-25 17:48+0900\n -PO-Revision-Date: 2012-11-25 18:22+0900\n +POT-Creation-Date: 2012-12-19 19:12+0900\n +PO-Revision-Date: 2012-12-19 22:33+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n -Language-Team: Japanese xfce-users...@ml.fdiary.net\n +Language-Team: Japanese xfce-users...@googlegroups.com\n Language: ja\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -215,35 +215,35 @@ msgstr SOCKET ID #: ../dialogs/display-settings/main.c:138 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 #: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 -#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39 +#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40 msgid Version information msgstr バージョン情報を表示する #: ../dialogs/accessibility-settings/main.c:192 #: ../dialogs/appearance-settings/main.c:966 -#: ../dialogs/display-settings/main.c:1941 +#: ../dialogs/display-settings/main.c:1943 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63 -#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60 +#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61 #, c-format msgid Type '%s --help' for usage. msgstr '%s --help' と入力すると使用方法が表示されます。 #: ../dialogs/accessibility-settings/main.c:211 #: ../dialogs/appearance-settings/main.c:985 -#: ../dialogs/display-settings/main.c:1960 +#: ../dialogs/display-settings/main.c:1962 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82 -#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76 +#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77 msgid The Xfce development team. All rights reserved. msgstr The Xfce development team. All rights reserved. #: ../dialogs/accessibility-settings/main.c:212 #: ../dialogs/appearance-settings/main.c:986 -#: ../dialogs/display-settings/main.c:1961 +#: ../dialogs/display-settings/main.c:1963 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83 -#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77 +#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78 #, c-format msgid Please report bugs to %s. msgstr バグの報告は %s までお願いします。 @@ -414,13 +414,12 @@ msgid Text msgstr 文字 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:40 -#: ../dialogs/display-settings/main.c:117 -msgid Both -msgstr 両方 +msgid Text under icons +msgstr アイコンの下に文字 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:41 -msgid Both Horizontal -msgstr 両方 (横方向) +msgid Text next to icons +msgstr アイコンの横に文字 #: ../dialogs/appearance-settings/main.c:733 #, c-format @@ -526,10 +525,6 @@ msgstr ミラー表示(_M) msgid Configure _new displays when connected msgstr 新しくディスプレイが接続されたら設定する(_N) -#: ../dialogs/display-settings/display-dialog.glade.h:11 -msgid Automatically show the \minimal dialog\ to quickly configure newly connected displays. -msgstr 新しくディスプレイが接続された時、速やかに設定するため自動的に \簡易設定ダイアログ\ を表示します。 - #: ../dialogs/display-settings/minimal-display-dialog.glade.h:1 msgid Displays msgstr ディスプレイ @@ -602,6 +597,10 @@ msgstr 水平 msgid Vertical msgstr 垂直 +#: ../dialogs/display-settings/main.c:117 +msgid Horizontal and Vertical +msgstr 垂直および水平 + #: ../dialogs/display-settings/main.c:139 msgid Minimal interface to set up an external output msgstr 外部出力を設定する最小限のインターフェイス @@ -633,22 +632,22 @@ msgstr 最後に有効だった出力を無効にしてはいけません。シ msgid Selected output not disabled msgstr 選択した出力は無効になっていません -#: ../dialogs/display-settings/main.c:1973 +#: ../dialogs/display-settings/main.c:1975 #: ../dialogs/display-settings/xfce-randr.c:350 #, c-format msgid Unable to query the version of the RandR extension being used msgstr 使用されている RandR エクステンションのバージョンを問い合わせることができません -#: ../dialogs/display-settings/main.c:1974 -#: ../dialogs/display-settings/main.c:2010 +#:
[Xfce4-commits] xfwm4:jeromeg/keyboard-shortcuts Creating branch jeromeg/keyboard-shortcuts
Updating branch refs/heads/jeromeg/keyboard-shortcuts as new branch to eceb53b301158fa901c8a56ed43adcd5bd458ecf (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/jeromeg/keyboard-shortcuts for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:jeromeg/keyboard-shortcuts Move shortcut names to libxfce4kbd-private.
Updating branch refs/heads/jeromeg/keyboard-shortcuts
to eceb53b301158fa901c8a56ed43adcd5bd458ecf (commit)
from ad0fe194157c9220e53255f30af2f9395e86da0d (commit)
commit eceb53b301158fa901c8a56ed43adcd5bd458ecf
Author: Jérôme Guelfucci jero...@xfce.org
Date: Wed Dec 19 17:37:11 2012 +0100
Move shortcut names to libxfce4kbd-private.
settings-dialogs/xfwm4-settings.c | 97 +++--
1 files changed, 8 insertions(+), 89 deletions(-)
diff --git a/settings-dialogs/xfwm4-settings.c
b/settings-dialogs/xfwm4-settings.c
index 212e4e7..a2f4690 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -43,6 +43,7 @@
#include xfconf/xfconf.h
#include libxfce4kbd-private/xfce-shortcut-dialog.h
#include libxfce4kbd-private/xfce-shortcuts-provider.h
+#include libxfce4kbd-private/xfwm4-shortcut-values.h
#include xfwm4-dialog_ui.h
#include xfwm4-settings.h
@@ -66,7 +67,6 @@
typedef struct _MenuTemplate MenuTemplate;
-typedef struct _ShortcutTemplate ShortcutTemplate;
@@ -198,13 +198,6 @@ struct _MenuTemplate
const gchar *value;
};
-struct _ShortcutTemplate
-{
- const gchar *name;
- const gchar *feature;
- const gchar *shortcut;
-};
-
enum
{
COL_THEME_NAME,
@@ -232,81 +225,7 @@ static const MenuTemplate title_align_values[] = {
{ NULL, NULL },
};
-static const ShortcutTemplate shortcut_values[] = {
- { N_(Window operations menu), popup_menu_key, NULL },
- { N_(Up), up_key, NULL },
- { N_(Down), down_key, NULL },
- { N_(Left), left_key, NULL },
- { N_(Right), right_key, NULL },
- { N_(Cancel), cancel_key, NULL },
- { N_(Cycle windows), cycle_windows_key, NULL },
- { N_(Cycle windows (Reverse)), cycle_reverse_windows_key, NULL },
- { N_(Switch window for same application), switch_window_key, NULL },
- { N_(Switch application), switch_application_key, NULL },
- { N_(Close window), close_window_key, NULL },
- { N_(Maximize window horizontally), maximize_horiz_key, NULL },
- { N_(Maximize window vertically), maximize_vert_key, NULL },
- { N_(Maximize window), maximize_window_key, NULL },
- { N_(Hide window), hide_window_key, NULL },
- { N_(Move window), move_window_key, NULL },
- { N_(Resize window), resize_window_key, NULL },
- { N_(Shade window), shade_window_key, NULL },
- { N_(Stick window), stick_window_key, NULL },
- { N_(Raise window), raise_window_key, NULL },
- { N_(Lower window), lower_window_key, NULL },
- { N_(Raise or lower window), raiselower_window_key, NULL },
- { N_(Fill window), fill_window_key, NULL },
- { N_(Fill window horizontally), fill_horiz_key, NULL },
- { N_(Fill window vertically), fill_vert_key, NULL },
- { N_(Toggle above), above_key, NULL },
- { N_(Toggle fullscreen), fullscreen_key, NULL },
- { N_(Move window to upper workspace), move_window_up_workspace_key, NULL
},
- { N_(Move window to bottom workspace), move_window_down_workspace_key,
NULL },
- { N_(Move window to left workspace), move_window_left_workspace_key,
NULL },
- { N_(Move window to right workspace), move_window_right_workspace_key,
NULL },
- { N_(Move window to previous workspace), move_window_prev_workspace_key,
NULL },
- { N_(Move window to next workspace), move_window_next_workspace_key,
NULL },
- { N_(Move window to workspace 1), move_window_workspace_1_key, NULL, },
- { N_(Move window to workspace 2), move_window_workspace_2_key, NULL, },
- { N_(Move window to workspace 3), move_window_workspace_3_key, NULL, },
- { N_(Move window to workspace 4), move_window_workspace_4_key, NULL, },
- { N_(Move window to workspace 5), move_window_workspace_5_key, NULL, },
- { N_(Move window to workspace 6), move_window_workspace_6_key, NULL, },
- { N_(Move window to workspace 7), move_window_workspace_7_key, NULL, },
- { N_(Move window to workspace 8), move_window_workspace_8_key, NULL, },
- { N_(Move window to workspace 9), move_window_workspace_9_key, NULL, },
- { N_(Move window to workspace 10), move_window_workspace_10_key, NULL, },
- { N_(Move window to workspace 11), move_window_workspace_11_key, NULL, },
- { N_(Move window to workspace 12), move_window_workspace_12_key, NULL, },
- { N_(Tile window to the top), tile_up_key, NULL, },
- { N_(Tile window to the bottom), tile_down_key, NULL, },
- { N_(Tile window to the left), tile_left_key, NULL, },
- { N_(Tile window to the right), tile_right_key, NULL, },
- { N_(Show desktop), show_desktop_key, NULL },
- { N_(Upper workspace), up_workspace_key, NULL },
- { N_(Bottom workspace), down_workspace_key, NULL },
- { N_(Left workspace), left_workspace_key, NULL },
- { N_(Right workspace), right_workspace_key, NULL },
- { N_(Previous workspace), prev_workspace_key, NULL },
- { N_(Next workspace), next_workspace_key, NULL },
- { N_(Workspace 1), workspace_1_key, NULL, },
- { N_(Workspace 2), workspace_2_key, NULL, },
- { N_(Workspace 3), workspace_3_key, NULL, },
- { N_(Workspace 4), workspace_4_key,
[Xfce4-commits] xfwm4:jeromeg/keyboard-shortcuts Show the label instead of the accelerator string.
Updating branch refs/heads/jeromeg/keyboard-shortcuts
to e7703727fbd5d91d6fd9de0a1a64bfef86eea296 (commit)
from eceb53b301158fa901c8a56ed43adcd5bd458ecf (commit)
commit e7703727fbd5d91d6fd9de0a1a64bfef86eea296
Author: Jérôme Guelfucci jero...@xfce.org
Date: Wed Dec 19 17:51:51 2012 +0100
Show the label instead of the accelerator string.
The dialog is far friendlier that way: we have human readable and
translated strings representing the shortcut instead of a bare Gtk+
accelerator.
settings-dialogs/xfwm4-settings.c | 29 -
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/settings-dialogs/xfwm4-settings.c
b/settings-dialogs/xfwm4-settings.c
index a2f4690..281a022 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -50,13 +50,14 @@
-#define DEFAULT_THEME Default
+#define DEFAULT_THEME Default
-#define INDICATOR_SIZE9
+#define INDICATOR_SIZE 9
-#define SHORTCUTS_NAME_COLUMN 0
-#define SHORTCUTS_FEATURE_COLUMN 1
-#define SHORTCUTS_SHORTCUT_COLUMN 2
+#define SHORTCUTS_NAME_COLUMN 0
+#define SHORTCUTS_FEATURE_COLUMN1
+#define SHORTCUTS_SHORTCUT_COLUMN 2
+#define SHORTCUTS_SHORTCUT_LABEL_COLUMN 3
@@ -66,7 +67,7 @@
-typedef struct _MenuTemplate MenuTemplate;
+typedef struct _MenuTemplateMenuTemplate;
@@ -512,7 +513,7 @@ xfwm_settings_constructed (GObject *object)
gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW
(shortcuts_treeview)),
GTK_SELECTION_MULTIPLE);
-list_store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING);
+list_store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING);
gtk_tree_view_set_model (GTK_TREE_VIEW (shortcuts_treeview),
GTK_TREE_MODEL (list_store));
g_object_unref (G_OBJECT (list_store));
@@ -524,7 +525,7 @@ xfwm_settings_constructed (GObject *object)
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW
(shortcuts_treeview),
1, _(Shortcut), renderer,
- text,
SHORTCUTS_SHORTCUT_COLUMN, NULL);
+ text,
SHORTCUTS_SHORTCUT_LABEL_COLUMN, NULL);
g_signal_connect (shortcuts_treeview, row-activated,
G_CALLBACK (xfwm_settings_shortcut_row_activated),
settings);
@@ -1679,8 +1680,18 @@ xfwm_settings_reload_shortcut (XfceShortcut *shortcut,
if (G_UNLIKELY (g_str_equal (feature, shortcut-command)))
{
+ GdkModifierType modifiers;
+ guintkeyval;
+ gchar *label;
+
+ /* Get the shortcut label */
+ gtk_accelerator_parse (shortcut-shortcut, keyval, modifiers);
+ label = gtk_accelerator_get_label (keyval, modifiers);
+
gtk_list_store_set (GTK_LIST_STORE (model), iter,
- SHORTCUTS_SHORTCUT_COLUMN,
shortcut-shortcut, -1);
+ SHORTCUTS_SHORTCUT_COLUMN,
shortcut-shortcut,
+ SHORTCUTS_SHORTCUT_LABEL_COLUMN, label, -1);
+ g_free (label);
}
g_free (feature);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master l10n: Updated Italian (it) translation to 99%
Updating branch refs/heads/master to 470cd007f50d9490dd37a11fa838448e4ff92b92 (commit) from b62b8cb6e89d3b40b8e1d1e3d6a714c3baa2acf8 (commit) commit 470cd007f50d9490dd37a11fa838448e4ff92b92 Author: Cristian Marchi cri.pe...@gmail.com Date: Wed Dec 19 21:23:02 2012 +0100 l10n: Updated Italian (it) translation to 99% New status: 213 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 105 +++-- 1 files changed, 60 insertions(+), 45 deletions(-) diff --git a/po/it.po b/po/it.po index 3f38517..15c4ed1 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: Parole\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-10 18:06+\n +POT-Creation-Date: 2012-12-19 16:06+\n PO-Revision-Date: 2010-02-19 09:04+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n Language-Team: Italian Translation Team xfce-it-translat...@googlegroups.com\n @@ -42,13 +42,17 @@ msgstr 4:3 (TV) msgid bigspan color='#BB'iby/i/span span color='#F4F4F4'Unknown Artist/span/big -msgstr bigspan color='#BB'iby/i/span span color='#F4F4F4'Artista sconosciuto/span/big +msgstr +bigspan color='#BB'iby/i/span span color='#F4F4F4'Artista +sconosciuto/span/big #: ../data/interfaces/parole.ui.h:5 msgid bigspan color='#BB'ion/i/span span color='#F4F4F4'Unknown Album/span/big -msgstr bigspan color='#BB'ion/i/span span color='#F4F4F4'Album sconosciuto/span/big +msgstr +bigspan color='#BB'ion/i/span span color='#F4F4F4'Album +sconosciuto/span/big #: ../data/interfaces/parole.ui.h:6 msgid span color='#F4F4F4'bbigUnknown Song/big/b/span @@ -71,12 +75,12 @@ msgstr Auto msgid Buffering (0%) msgstr Buffering (0%) -#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:707 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:708 msgid Empty msgstr Vuota -#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:111 -#: ../src/parole-disc.c:157 +#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:110 +#: ../src/parole-disc.c:156 msgid Insert Disc msgstr Inserire disco @@ -201,27 +205,36 @@ msgid DVD Name msgstr Nome DVD #: ../data/interfaces/playlist.ui.h:7 +msgid Disc Playlist +msgstr Scaletta disco + +#: ../data/interfaces/playlist.ui.h:8 msgid Play opened files msgstr Avvia la riproduzione dei file aperti -#: ../data/interfaces/playlist.ui.h:8 +#: ../data/interfaces/playlist.ui.h:9 ../src/parole-medialist.c:785 +#: ../src/parole-player.c:2960 +msgid Playlist +msgstr Scaletta + +#: ../data/interfaces/playlist.ui.h:10 #: ../data/interfaces/parole-settings.ui.h:17 msgid Remember playlist msgstr Ricorda scaletta -#: ../data/interfaces/playlist.ui.h:9 +#: ../data/interfaces/playlist.ui.h:11 msgid Repeat msgstr Ripeti -#: ../data/interfaces/playlist.ui.h:10 +#: ../data/interfaces/playlist.ui.h:12 msgid Replace playlist when opening files msgstr Sostituisci la scaletta all'apertura dei file -#: ../data/interfaces/playlist.ui.h:11 +#: ../data/interfaces/playlist.ui.h:13 msgid Shuffle msgstr Casuale -#: ../data/interfaces/playlist.ui.h:12 +#: ../data/interfaces/playlist.ui.h:14 msgid Title Menu msgstr Menu titolo @@ -382,7 +395,7 @@ msgstr Messaggio msgid Error msgstr Errore -#: ../src/gst/parole-gst.c:1239 ../src/parole-medialist.c:344 +#: ../src/gst/parole-gst.c:1239 ../src/parole-medialist.c:357 #, c-format msgid Track %i msgstr Traccia %i @@ -543,32 +556,32 @@ msgstr msgid Supported files msgstr File supportati -#: ../src/parole-mediachooser.c:217 ../src/parole-player.c:920 +#: ../src/parole-mediachooser.c:217 ../src/parole-player.c:921 msgid All files msgstr Tutti i file -#: ../src/parole-medialist.c:360 +#: ../src/parole-medialist.c:373 #, c-format msgid Chapter %i msgstr Capitolo %i -#: ../src/parole-medialist.c:630 +#: ../src/parole-medialist.c:643 msgid Permission denied msgstr Permesso negato -#: ../src/parole-medialist.c:632 +#: ../src/parole-medialist.c:645 msgid Error saving playlist file msgstr Errore nel salvataggio del file della scaletta -#: ../src/parole-medialist.c:644 +#: ../src/parole-medialist.c:657 msgid Unknown playlist format msgstr Formato scaletta sconosciuto -#: ../src/parole-medialist.c:645 +#: ../src/parole-medialist.c:658 msgid Please chooser a supported playlist format msgstr Selezionare un formato di scaletta supportato -#: ../src/parole-medialist.c:697 ../src/parole-plugins-manager.c:349 +#: ../src/parole-medialist.c:710 ../src/parole-plugins-manager.c:349 #: ../src/plugins/properties/stream-properties-provider.c:140 #: ../src/plugins/properties/stream-properties-provider.c:141 #: ../src/plugins/properties/stream-properties-provider.c:142 @@ -576,35 +589,35 @@ msgstr Selezionare un formato di scaletta supportato msgid Unknown msgstr Sconosciuto -#:
[Xfce4-commits] terminal:master Drop bug report from the menu actions.
Updating branch refs/heads/master to 58701d92731d5cfda5906632512041f3ad758193 (commit) from f150f8d8fa0e4d26c5ea1733b7985742da2d3144 (commit) commit 58701d92731d5cfda5906632512041f3ad758193 Author: Nick Schermer n...@xfce.org Date: Tue Dec 18 19:58:06 2012 +0100 Drop bug report from the menu actions. terminal/terminal-toolbars-model.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/terminal/terminal-toolbars-model.c b/terminal/terminal-toolbars-model.c index 1ded24e..bdadb2f 100644 --- a/terminal/terminal-toolbars-model.c +++ b/terminal/terminal-toolbars-model.c @@ -53,7 +53,6 @@ static const gchar *actions[] = reset, reset-and-clear, contents, - report-bug, about, }; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] terminal:master Set stock menu icon for toolbar.
Updating branch refs/heads/master
to 3309b6866d36a3c8f918bd96e5d5a2fad043d7b3 (commit)
from 58701d92731d5cfda5906632512041f3ad758193 (commit)
commit 3309b6866d36a3c8f918bd96e5d5a2fad043d7b3
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 18 20:08:00 2012 +0100
Set stock menu icon for toolbar.
Forgot we had a toolbar...
terminal/terminal-window.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index 0017b10..7f390cb 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -250,7 +250,7 @@ static const GtkToggleActionEntry toggle_action_entries[] =
{ show-menubar, NULL, N_ (Show _Menubar), NULL, N_ (Show/hide the
menubar), G_CALLBACK (terminal_window_action_show_menubar), FALSE, },
{ show-toolbars, NULL, N_ (Show _Toolbars), NULL, N_ (Show/hide the
toolbars), G_CALLBACK (terminal_window_action_show_toolbars), FALSE, },
{ show-borders, NULL, N_ (Show Window _Borders), NULL, N_ (Show/hide
the window decorations), G_CALLBACK (terminal_window_action_show_borders),
TRUE, },
- { fullscreen, NULL, N_ (_Fullscreen), NULL, N_ (Toggle fullscreen
mode), G_CALLBACK (terminal_window_action_fullscreen), FALSE, },
+ { fullscreen, GTK_STOCK_FULLSCREEN, N_ (_Fullscreen), NULL, N_ (Toggle
fullscreen mode), G_CALLBACK (terminal_window_action_fullscreen), FALSE, },
};
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] terminal:master Drop anti-alias preference.
Updating branch refs/heads/master
to 88f342aa527d4da79cef8308595457c0e3491eae (commit)
from 9c8f6b91a6922b2c4743a233359ecd59ff0f6ea8 (commit)
commit 88f342aa527d4da79cef8308595457c0e3491eae
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 18 20:14:55 2012 +0100
Drop anti-alias preference.
This is not supported (deprecated, removed in 0.3 branch)
in vte. And why would you want ugly fonts anyway ;-).
Terminal.glade | 16 +---
terminal/terminal-preferences-dialog.c | 29 ++---
terminal/terminal-preferences.c| 15 ---
terminal/terminal-private.h|8
terminal/terminal-screen.c | 17 -
5 files changed, 11 insertions(+), 74 deletions(-)
diff --git a/Terminal.glade b/Terminal.glade
index 5da4a6f..7f2da16 100644
--- a/Terminal.glade
+++ b/Terminal.glade
@@ -488,20 +488,6 @@
/packing
/child
child
- object class=GtkCheckButton
id=font-anti-alias
-property name=label
translatable=yesEnab_le anti-aliasing for the terminal font/property
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property
name=receives_defaultFalse/property
-property name=tooltip_text
translatable=yesEnable this option if you want Terminal to use anti-aliasing
when rendering text in terminal windows. Disabling this option can impressively
speed up terminal rendering performance and reduce the overall system load on
slow systems./property
-property name=use_underlineTrue/property
-property name=draw_indicatorTrue/property
- /object
- packing
-property name=position1/property
- /packing
-/child
-child
object class=GtkCheckButton
id=font-allow-bold
property name=label
translatable=yesAllow bold te_xt/property
property name=visibleTrue/property
@@ -512,7 +498,7 @@
property name=draw_indicatorTrue/property
/object
packing
-property name=position2/property
+property name=position1/property
/packing
/child
/object
diff --git a/terminal/terminal-preferences-dialog.c
b/terminal/terminal-preferences-dialog.c
index bb1f85f..44d5543 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -88,21 +88,19 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog
*dialog)
gchar*file;
ExoMutualBinding *binding;
const gchar *props_active[] = { title-mode, command-login-shell,
-command-update-records,
scrolling-single-line,
-scrolling-on-output,
scrolling-on-keystroke,
-scrolling-bar, font-allow-bold,
-misc-menubar-default,
misc-toolbars-default,
-misc-borders-default,
color-selection-use-default,
-shortcuts-no-mnemonics,
shortcuts-no-menukey,
-binding-backspace, binding-delete,
-background-mode, background-image-style
-#if TERMINAL_HAS_ANTI_ALIAS_SETTING
-, font-anti-alias
-#endif
+ command-update-records,
scrolling-single-line,
+ scrolling-on-output,
scrolling-on-keystroke,
+ scrolling-bar, font-allow-bold,
+ misc-menubar-default,
misc-toolbars-default,
+ misc-borders-default,
color-selection-use-default,
+ shortcuts-no-mnemonics,
shortcuts-no-menukey,
+ binding-backspace, binding-delete,
+ background-mode,
background-image-style
};
const gchar *props_color[] = { color-foreground, color-cursor,
color-background,
tab-activity-color,
- color-selection };
+
[Xfce4-commits] terminal:master Depend on vte 0.28 and exo 0.10.
Updating branch refs/heads/master to 9c8f6b91a6922b2c4743a233359ecd59ff0f6ea8 (commit) from 3309b6866d36a3c8f918bd96e5d5a2fad043d7b3 (commit) commit 9c8f6b91a6922b2c4743a233359ecd59ff0f6ea8 Author: Nick Schermer n...@xfce.org Date: Tue Dec 18 20:09:37 2012 +0100 Depend on vte 0.28 and exo 0.10. VTE for upcomming commits and exo for some fixes in 0.10 configure.ac.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index f4e1fab..74ac2b0 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -81,9 +81,9 @@ XDT_CHECK_LIBX11() dnl *** dnl *** Check for required packages *** dnl *** -XDT_CHECK_PACKAGE([EXO], [exo-1], [0.8.0]) +XDT_CHECK_PACKAGE([EXO], [exo-1], [0.10.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) -XDT_CHECK_PACKAGE([VTE], [vte], [0.17.1]) +XDT_CHECK_PACKAGE([VTE], [vte], [0.28]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.26.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] terminal:master Remove deprecated code chunks.
Updating branch refs/heads/master
to b6e058f7f622722ccdd8fe0b0a0fed9aad2d2cd8 (commit)
from 88f342aa527d4da79cef8308595457c0e3491eae (commit)
commit b6e058f7f622722ccdd8fe0b0a0fed9aad2d2cd8
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 18 20:21:00 2012 +0100
Remove deprecated code chunks.
terminal/terminal-dialogs.c|6 ---
terminal/terminal-preferences-dialog.c |6 ---
terminal/terminal-screen.c | 62
3 files changed, 7 insertions(+), 67 deletions(-)
diff --git a/terminal/terminal-dialogs.c b/terminal/terminal-dialogs.c
index 0456e19..b10cb71 100644
--- a/terminal/terminal-dialogs.c
+++ b/terminal/terminal-dialogs.c
@@ -77,12 +77,6 @@ terminal_dialogs_show_about (GtkWindow *parent)
if (logo == NULL)
logo = gdk_pixbuf_new_from_file_at_size (DATADIR
/icons/hicolor/scalable/apps/Terminal.svg, 128, 128, NULL);
- /* set dialog hook on gtk versions older then 2.18 */
-#if !GTK_CHECK_VERSION (2, 18, 0)
- gtk_about_dialog_set_email_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
- gtk_about_dialog_set_url_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
-#endif
-
/* open the about dialog */
gtk_show_about_dialog (parent,
authors, authors,
diff --git a/terminal/terminal-preferences-dialog.c
b/terminal/terminal-preferences-dialog.c
index 44d5543..c6ed4ea 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -104,12 +104,6 @@ terminal_preferences_dialog_init
(TerminalPreferencesDialog *dialog)
dialog-preferences = terminal_preferences_get ();
-#if !LIBXFCE4UTIL_CHECK_VERSION (4, 7, 2)
- /* restore the default translation domain. this is broken by libxfce4util
- * 4.7.2, after calling XFCE_LICENSE_GPL. see bug #5842. */
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, UTF-8);
-#endif
-
/* hack to initialize the XfceTitledDialog class */
if (xfce_titled_dialog_get_type () == 0)
return;
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 16cf31f..82a1c91 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -756,11 +756,7 @@ terminal_screen_binding_vte (TerminalEraseBinding binding)
return VTE_ERASE_DELETE_SEQUENCE;
case TERMINAL_ERASE_BINDING_ERASE_TTY:
-#if VTE_CHECK_VERSION (0, 20, 4)
return VTE_ERASE_TTY;
-#else
- return VTE_ERASE_ASCII_BACKSPACE;
-#endif
default:
terminal_assert_not_reached ();
@@ -896,7 +892,6 @@ terminal_screen_update_misc_cursor_blinks (TerminalScreen
*screen)
static void
terminal_screen_update_misc_cursor_shape (TerminalScreen *screen)
{
-#if VTE_CHECK_VERSION (0, 19, 1)
TerminalCursorShapeval;
VteTerminalCursorShape shape = VTE_CURSOR_SHAPE_BLOCK;
@@ -920,7 +915,6 @@ terminal_screen_update_misc_cursor_shape (TerminalScreen
*screen)
}
vte_terminal_set_cursor_shape (VTE_TERMINAL (screen-terminal), shape);
-#endif
}
@@ -1086,13 +1080,11 @@ terminal_screen_vte_resize_window (VteTerminal
*terminal,
TerminalScreen *screen)
{
GtkWidget *toplevel;
- gint xpad;
- gint ypad;
+ gint xpad = 0;
+ gint ypad = 0;
gint grid_width;
gint grid_height;
-#if VTE_CHECK_VERSION (0, 24, 0)
GtkBorder *border = NULL;
-#endif
terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
@@ -1106,7 +1098,6 @@ terminal_screen_vte_resize_window (VteTerminal
*terminal,
/* we have to calculate the grid size, because the signal
* returns a size in pixels */
-#if VTE_CHECK_VERSION (0, 24, 0)
gtk_widget_style_get (GTK_WIDGET (terminal), inner-border, border, NULL);
if (border != NULL)
{
@@ -1114,13 +1105,7 @@ terminal_screen_vte_resize_window (VteTerminal
*terminal,
ypad = border-top + border-bottom;
gtk_border_free (border);
}
- else
-{
- xpad = ypad = 0;
-}
-#else
- vte_terminal_get_padding (terminal, xpad, ypad);
-#endif
+
grid_width = (width - xpad) / terminal-char_width;
grid_height = (height - ypad) / terminal-char_height;
@@ -1289,9 +1274,7 @@ terminal_screen_update_label_orientation (TerminalScreen
*screen)
GtkPositionType position;
gdouble angle;
PangoEllipsizeMode ellipsize;
-#if GTK_CHECK_VERSION (2, 16, 0)
GtkWidget *box;
-#endif
terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
terminal_return_if_fail (screen-tab_label == NULL || GTK_IS_LABEL
(screen-tab_label));
@@ -1324,12 +1307,10 @@ terminal_screen_update_label_orientation
(TerminalScreen *screen)
gtk_label_set_angle (GTK_LABEL (screen-tab_label), angle);
gtk_label_set_ellipsize (GTK_LABEL (screen-tab_label), ellipsize);
-#if GTK_CHECK_VERSION (2, 16, 0)
box = gtk_widget_get_parent (screen-tab_label);
terminal_return_if_fail (GTK_IS_ORIENTABLE
[Xfce4-commits] terminal:master Add =+@ to the default word-chars.
Updating branch refs/heads/master to c7bcda4765aadf90b0c2f33cda631f6ae7bfc281 (commit) from b6e058f7f622722ccdd8fe0b0a0fed9aad2d2cd8 (commit) commit c7bcda4765aadf90b0c2f33cda631f6ae7bfc281 Author: Nick Schermer n...@xfce.org Date: Tue Dec 18 20:31:24 2012 +0100 Add =+@ to the default word-chars. terminal/terminal-preferences.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c index 4c89b83..e3f0056 100644 --- a/terminal/terminal-preferences.c +++ b/terminal/terminal-preferences.c @@ -1206,7 +1206,7 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass) g_param_spec_string (word-chars, word-chars, WordChars, - -A-Za-z0-9,./?%#:_~, + -A-Za-z0-9,./?%#:_=+@~, EXO_PARAM_READWRITE); /* install all properties */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] terminal:master Some code comments.
Updating branch refs/heads/master
to 056e72e59069347749bce53b5c753acb83334842 (commit)
from c7bcda4765aadf90b0c2f33cda631f6ae7bfc281 (commit)
commit 056e72e59069347749bce53b5c753acb83334842
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 18 20:43:50 2012 +0100
Some code comments.
terminal/terminal-preferences.h |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/terminal/terminal-preferences.h b/terminal/terminal-preferences.h
index 7aa5d6e..f9e7d19 100644
--- a/terminal/terminal-preferences.h
+++ b/terminal/terminal-preferences.h
@@ -68,10 +68,10 @@ typedef enum /* enum,prefix=TERMINAL_BACKGROUND_STYLE */
typedef enum /* enum,prefix=TERMINAL_ERASE_BINDING */
{
TERMINAL_ERASE_BINDING_AUTO,
- TERMINAL_ERASE_BINDING_ASCII_DELETE,
- TERMINAL_ERASE_BINDING_DELETE_SEQUENCE,
- TERMINAL_ERASE_BINDING_ASCII_BACKSPACE,
- TERMINAL_ERASE_BINDING_ERASE_TTY
+ TERMINAL_ERASE_BINDING_ASCII_DELETE,/* ASCII DEL */
+ TERMINAL_ERASE_BINDING_DELETE_SEQUENCE, /* Escape Sequence */
+ TERMINAL_ERASE_BINDING_ASCII_BACKSPACE, /* Control-H */
+ TERMINAL_ERASE_BINDING_ERASE_TTY/* TTY Erase */
} TerminalEraseBinding;
typedef enum /* enum,prefix=TERMINAL_CURSOR_SHAPE */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Use Primary instead of Control (bug #8200).
Updating branch refs/heads/jeromeg/keyboard-shortcuts to 128a25d53a689896f29a0936d0d686478c107aa7 (commit) from 0d2c165aeff3da0268276cbc75f9470bfc349e4b (commit) commit 128a25d53a689896f29a0936d0d686478c107aa7 Author: Jérôme Guelfucci jero...@xfce.org Date: Wed Dec 19 14:56:06 2012 +0100 Use Primary instead of Control (bug #8200). While Control works fine now for grabbing / detecting, shortcut comparison is broken because the strings are different. This only deals with the default shortcuts, we need to migrate the custom shortcuts. libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 66 +++--- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml index cf1978d..2b1507e 100644 --- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml @@ -10,10 +10,10 @@ property name=lt;Altgt;F3 type=string value=xfce4-appfinder property name=startup-notify type=bool value=true/ /property - property name=lt;Controlgt;lt;Altgt;Delete type=string value=xflock4/ + property name=lt;Primarygt;lt;Altgt;Delete type=string value=xflock4/ property name=XF86Display type=string value=xfce4-display-settings --minimal/ property name=lt;Supergt;p type=string value=xfce4-display-settings --minimal/ - property name=lt;Controlgt;Escape type=string value=xfdesktop --menu/ + property name=lt;Primarygt;Escape type=string value=xfdesktop --menu/ property name=XF86WWW type=string value=exo-open --launch WebBrowser/ property name=XF86Mail type=string value=exo-open --launch MailReader/ /property @@ -29,8 +29,8 @@ property name=lt;Altgt;Tab type=string value=cycle_windows_key/ property name=lt;Altgt;lt;Shiftgt;Tab type=string value=cycle_reverse_windows_key/ property name=lt;Altgt;Delete type=string value=del_workspace_key/ - property name=lt;Controlgt;lt;Altgt;Down type=string value=down_workspace_key/ - property name=lt;Controlgt;lt;Altgt;Left type=string value=left_workspace_key/ + property name=lt;Primarygt;lt;Altgt;Down type=string value=down_workspace_key/ + property name=lt;Primarygt;lt;Altgt;Left type=string value=left_workspace_key/ property name=lt;Shiftgt;lt;Altgt;Page_Down type=string value=lower_window_key/ property name=lt;Altgt;F4 type=string value=close_window_key/ property name=lt;Altgt;F6 type=string value=stick_window_key/ @@ -40,38 +40,38 @@ property name=lt;Altgt;F10 type=string value=maximize_window_key/ property name=lt;Altgt;F11 type=string value=fullscreen_key/ property name=lt;Altgt;F12 type=string value=above_key/ - property name=lt;Controlgt;lt;Shiftgt;lt;Altgt;Left type=string value=move_window_left_key/ - property name=lt;Altgt;lt;Controlgt;End type=string value=move_window_next_workspace_key/ - property name=lt;Altgt;lt;Controlgt;Home type=string value=move_window_prev_workspace_key/ - property name=lt;Controlgt;lt;Shiftgt;lt;Altgt;Right type=string value=move_window_right_key/ - property name=lt;Controlgt;lt;Shiftgt;lt;Altgt;Up type=string value=move_window_up_key/ - property name=lt;Altgt;lt;Controlgt;KP_1 type=string value=move_window_workspace_1_key/ - property name=lt;Altgt;lt;Controlgt;KP_2 type=string value=move_window_workspace_2_key/ - property name=lt;Altgt;lt;Controlgt;KP_3 type=string value=move_window_workspace_3_key/ - property name=lt;Altgt;lt;Controlgt;KP_4 type=string value=move_window_workspace_4_key/ - property name=lt;Altgt;lt;Controlgt;KP_5 type=string value=move_window_workspace_5_key/ - property name=lt;Altgt;lt;Controlgt;KP_6 type=string value=move_window_workspace_6_key/ - property name=lt;Altgt;lt;Controlgt;KP_7 type=string value=move_window_workspace_7_key/ - property name=lt;Altgt;lt;Controlgt;KP_8 type=string value=move_window_workspace_8_key/ - property name=lt;Altgt;lt;Controlgt;KP_9 type=string value=move_window_workspace_9_key/ + property name=lt;Primarygt;lt;Shiftgt;lt;Altgt;Left type=string value=move_window_left_key/ + property name=lt;Altgt;lt;Primarygt;End type=string value=move_window_next_workspace_key/ + property name=lt;Altgt;lt;Primarygt;Home type=string value=move_window_prev_workspace_key/ + property name=lt;Primarygt;lt;Shiftgt;lt;Altgt;Right type=string value=move_window_right_key/ + property name=lt;Primarygt;lt;Shiftgt;lt;Altgt;Up type=string value=move_window_up_key/ + property name=lt;Altgt;lt;Primarygt;KP_1 type=string value=move_window_workspace_1_key/ + property name=lt;Altgt;lt;Primarygt;KP_2 type=string value=move_window_workspace_2_key/ + property name=lt;Altgt;lt;Primarygt;KP_3 type=string value=move_window_workspace_3_key/ +
[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Move xfwm4 shortcut names to libxfce4kbd-private.
Updating branch refs/heads/jeromeg/keyboard-shortcuts
to c08f561880fcf5633b48549aef8b11710b6ded37 (commit)
from 128a25d53a689896f29a0936d0d686478c107aa7 (commit)
commit c08f561880fcf5633b48549aef8b11710b6ded37
Author: Jérôme Guelfucci jero...@xfce.org
Date: Wed Dec 19 17:38:10 2012 +0100
Move xfwm4 shortcut names to libxfce4kbd-private.
libxfce4kbd-private/Makefile.am |3 +-
libxfce4kbd-private/xfwm4-shortcut-values.h | 106 +++
2 files changed, 108 insertions(+), 1 deletions(-)
diff --git a/libxfce4kbd-private/Makefile.am b/libxfce4kbd-private/Makefile.am
index 145d175..b9b438f 100644
--- a/libxfce4kbd-private/Makefile.am
+++ b/libxfce4kbd-private/Makefile.am
@@ -15,7 +15,8 @@ libxfce4kbd_headers = \
xfce-shortcuts-provider.h \
xfce-shortcuts-grabber.h \
xfce-shortcut-dialog.h \
- xfce-shortcuts.h
+ xfce-shortcuts.h \
+ xfwm4-shortcut-values.h
libxfce4kbd_built_sources = \
xfce-shortcuts-marshal.c \
diff --git a/libxfce4kbd-private/xfwm4-shortcut-values.h
b/libxfce4kbd-private/xfwm4-shortcut-values.h
new file mode 100644
index 000..4bd32ef
--- /dev/null
+++ b/libxfce4kbd-private/xfwm4-shortcut-values.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2008 Stephan Arts step...@xfce.org
+ * Copyright (c) 2008 Jannis Pohlmann jan...@xfce.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include glib.h
+
+typedef struct _ShortcutTemplate ShortcutTemplate;
+
+struct _ShortcutTemplate
+{
+ const gchar *name;
+ const gchar *feature;
+ const gchar *shortcut;
+};
+
+const ShortcutTemplate xfwm4_shortcut_values[] = {
+ { N_(Window operations menu), popup_menu_key, NULL },
+ { N_(Up), up_key, NULL },
+ { N_(Down), down_key, NULL },
+ { N_(Left), left_key, NULL },
+ { N_(Right), right_key, NULL },
+ { N_(Cancel), cancel_key, NULL },
+ { N_(Cycle windows), cycle_windows_key, NULL },
+ { N_(Cycle windows (Reverse)), cycle_reverse_windows_key, NULL },
+ { N_(Switch window for same application), switch_window_key, NULL },
+ { N_(Switch application), switch_application_key, NULL },
+ { N_(Close window), close_window_key, NULL },
+ { N_(Maximize window horizontally), maximize_horiz_key, NULL },
+ { N_(Maximize window vertically), maximize_vert_key, NULL },
+ { N_(Maximize window), maximize_window_key, NULL },
+ { N_(Hide window), hide_window_key, NULL },
+ { N_(Move window), move_window_key, NULL },
+ { N_(Resize window), resize_window_key, NULL },
+ { N_(Shade window), shade_window_key, NULL },
+ { N_(Stick window), stick_window_key, NULL },
+ { N_(Raise window), raise_window_key, NULL },
+ { N_(Lower window), lower_window_key, NULL },
+ { N_(Raise or lower window), raiselower_window_key, NULL },
+ { N_(Fill window), fill_window_key, NULL },
+ { N_(Fill window horizontally), fill_horiz_key, NULL },
+ { N_(Fill window vertically), fill_vert_key, NULL },
+ { N_(Toggle above), above_key, NULL },
+ { N_(Toggle fullscreen), fullscreen_key, NULL },
+ { N_(Move window to upper workspace), move_window_up_workspace_key, NULL
},
+ { N_(Move window to bottom workspace), move_window_down_workspace_key,
NULL },
+ { N_(Move window to left workspace), move_window_left_workspace_key,
NULL },
+ { N_(Move window to right workspace), move_window_right_workspace_key,
NULL },
+ { N_(Move window to previous workspace), move_window_prev_workspace_key,
NULL },
+ { N_(Move window to next workspace), move_window_next_workspace_key,
NULL },
+ { N_(Move window to workspace 1), move_window_workspace_1_key, NULL, },
+ { N_(Move window to workspace 2), move_window_workspace_2_key, NULL, },
+ { N_(Move window to workspace 3), move_window_workspace_3_key, NULL, },
+ { N_(Move window to workspace 4), move_window_workspace_4_key, NULL, },
+ { N_(Move window to workspace 5), move_window_workspace_5_key, NULL, },
+ { N_(Move window to workspace 6), move_window_workspace_6_key, NULL, },
+ { N_(Move window to workspace 7), move_window_workspace_7_key, NULL, },
+ { N_(Move window to workspace 8), move_window_workspace_8_key, NULL, },
+ { N_(Move window to workspace 9), move_window_workspace_9_key, NULL, },
+ { N_(Move window to workspace 10), move_window_workspace_10_key, NULL, },
+ { N_(Move window
[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Show the window manager action name when conflicting.
Updating branch refs/heads/jeromeg/keyboard-shortcuts
to 53be9bc959c524a140c89e0649be7bb86f191550 (commit)
from c08f561880fcf5633b48549aef8b11710b6ded37 (commit)
commit 53be9bc959c524a140c89e0649be7bb86f191550
Author: Jérôme Guelfucci jero...@xfce.org
Date: Wed Dec 19 22:26:09 2012 +0100
Show the window manager action name when conflicting.
We use the translated string representing the window manager action so
that the conflict is easy to understand.
libxfce4kbd-private/xfce-shortcuts.c | 48 +
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/libxfce4kbd-private/xfce-shortcuts.c
b/libxfce4kbd-private/xfce-shortcuts.c
index fa417c9..e569a0e 100644
--- a/libxfce4kbd-private/xfce-shortcuts.c
+++ b/libxfce4kbd-private/xfce-shortcuts.c
@@ -33,6 +33,7 @@
#include xfconf/xfconf.h
#include libxfce4kbd-private/xfce-shortcuts.h
+#include libxfce4kbd-private/xfwm4-shortcut-values.h
@@ -49,8 +50,8 @@ typedef struct
static XfceShortcutConflictMessage conflict_messages[] = {
{ xfwm4, xfwm4,
-N_(This shortcut is already being used for another window manager action.
Which action do you want to use?),
-N_(Use '%s'), N_(Keep the other one) },
+N_(This shortcut is already being used for the action '%s'. Which action
do you want to use?),
+N_(Use '%s'), N_(Keep '%s') },
{ xfwm4, commands,
N_(This shortcut is already being used for the command '%s'. Which action
do you want to use?),
N_(Use '%s'), N_(Keep '%s') },
@@ -58,8 +59,8 @@ static XfceShortcutConflictMessage conflict_messages[] = {
N_(This shortcut is already being used for the command '%s'. Which action
do you want to use?),
N_(Use '%s'), N_(Keep '%s') },
{ commands, xfwm4,
-N_(This shortcut is already being used by a window manager action. Which
action do you want to use?),
-N_(Use '%s'), N_(Keep the window manager action) },
+N_(This shortcut is already being used by the action '%s'. Which action
do you want to use?),
+N_(Use '%s'), N_(Keep '%s') },
{ 0, 0, NULL, NULL, NULL },
};
@@ -106,8 +107,43 @@ xfce_shortcut_conflict_dialog (const gchar *owner,
if (g_utf8_collate (conflict_messages[i].owner_name, owner) == 0
g_utf8_collate (conflict_messages[i].other_name, other) == 0)
{
-owner_action_name = owner_action == NULL ? NULL : g_markup_escape_text
(owner_action, -1);
-other_action_name = other_action == NULL ? NULL : g_markup_escape_text
(other_action, -1);
+if (owner_action == NULL)
+ owner_action_name = NULL;
+else if (g_utf8_collate (owner, xfwm4) == 0)
+ {
+gint j;
+
+/* We need to get the human readable string of the action name */
+for (j = 0; xfwm4_shortcut_values[j].name != NULL; ++j)
+if (G_UNLIKELY (g_str_equal (xfwm4_shortcut_values[j].feature,
+ owner_action)))
+ {
+owner_action_name =
+ g_markup_escape_text (xfwm4_shortcut_values[j].name, -1);
+break;
+ }
+ }
+else
+ owner_action_name = g_markup_escape_text (owner_action, -1);
+
+if (other_action == NULL)
+ other_action_name = NULL;
+else if (g_utf8_collate (other, xfwm4) == 0)
+ {
+gint j;
+
+/* We need to get the human readable string of the action name */
+for (j = 0; xfwm4_shortcut_values[j].name != NULL; ++j)
+if (G_UNLIKELY (g_str_equal (xfwm4_shortcut_values[j].feature,
+ other_action)))
+ {
+other_action_name =
+ g_markup_escape_text (xfwm4_shortcut_values[j].name, -1);
+break;
+ }
+ }
+else
+ other_action_name = g_markup_escape_text (other_action, -1);
secondary_text = g_strdup_printf (_(conflict_messages[i].message),
other_action_name);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Add xfwm4 shortcut values to POTFILES.in
Updating branch refs/heads/jeromeg/keyboard-shortcuts to 8f1bb1455886ee653979fddd3d2aaedf43a0ee2c (commit) from 53be9bc959c524a140c89e0649be7bb86f191550 (commit) commit 8f1bb1455886ee653979fddd3d2aaedf43a0ee2c Author: Jérôme Guelfucci jero...@xfce.org Date: Wed Dec 19 22:28:07 2012 +0100 Add xfwm4 shortcut values to POTFILES.in po/POTFILES.in |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 8ad7d7f..55e6864 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -17,6 +17,7 @@ libxfce4kbd-private/xfce-shortcuts.c libxfce4kbd-private/xfce-shortcut-dialog.c libxfce4kbd-private/xfce-shortcuts-grabber.c libxfce4kbd-private/xfce-shortcuts-provider.c +libxfce4kbd-private/xfwm4-shortcut-values.h # # Support for GtkBuilder ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:jeromeg/keyboard-shortcuts Update treeview when clearing a shortcut.
Updating branch refs/heads/jeromeg/keyboard-shortcuts
to 556ffdb3fd2e6e414de8cb347f2c9d8251aebf9d (commit)
from e7703727fbd5d91d6fd9de0a1a64bfef86eea296 (commit)
commit 556ffdb3fd2e6e414de8cb347f2c9d8251aebf9d
Author: Jérôme Guelfucci jero...@xfce.org
Date: Wed Dec 19 22:59:04 2012 +0100
Update treeview when clearing a shortcut.
settings-dialogs/xfwm4-settings.c | 10 ++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/settings-dialogs/xfwm4-settings.c
b/settings-dialogs/xfwm4-settings.c
index 281a022..6746d27 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -1731,6 +1731,9 @@ xfwm_settings_shortcut_added (XfceShortcutsProvider
*provider,
XfwmSettings *settings)
{
g_return_if_fail (XFWM_IS_SETTINGS (settings));
+
+ DBG (Shortcut added signal: %s, shortcut);
+
xfwm_settings_reload_shortcuts (settings);
}
@@ -1742,6 +1745,9 @@ xfwm_settings_shortcut_removed (XfceShortcutsProvider
*provider,
XfwmSettings *settings)
{
g_return_if_fail (XFWM_IS_SETTINGS (settings));
+
+ DBG (Shortcut removed signal: %s, shortcut);
+
xfwm_settings_reload_shortcuts (settings);
}
@@ -1792,6 +1798,10 @@ xfwm_settings_shortcut_clear_clicked (GtkButton
*button,
/* Remove keyboard shortcut via xfconf */
xfce_shortcuts_provider_reset_shortcut
(settings-priv-provider, shortcut);
+ gtk_list_store_set (GTK_LIST_STORE (model), tree_iter,
+ SHORTCUTS_SHORTCUT_COLUMN, NULL,
+ SHORTCUTS_SHORTCUT_LABEL_COLUMN, NULL, -1);
+
/* Free shortcut string */
g_free (shortcut);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:jeromeg/keyboard-shortcuts Revert Keep the shortcut dialog above other windows.
Updating branch refs/heads/jeromeg/keyboard-shortcuts to 5e1aedff6e3b9b84429d38db4f0558d423cf7d08 (commit) from 276875f5f784894b1c75c1b7dd93b599a6235a4c (commit) commit 5e1aedff6e3b9b84429d38db4f0558d423cf7d08 Author: Jérôme Guelfucci jero...@xfce.org Date: Wed Dec 19 23:03:56 2012 +0100 Revert Keep the shortcut dialog above other windows. This reverts commit a04edfc41ab2035383793ca8315e2e61351108c2. Error and conflict dialogs are kept under the grab dialog which makes them unusable. dialogs/keyboard-settings/xfce-keyboard-settings.c | 11 --- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c index fd8b70e..917e35e 100644 --- a/dialogs/keyboard-settings/xfce-keyboard-settings.c +++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c @@ -678,12 +678,6 @@ xfce_keyboard_settings_edit_shortcut (XfceKeyboardSettings *settings, /* Request a new shortcut from the user */ dialog = xfce_shortcut_dialog_new (commands, command, command); g_signal_connect (dialog, validate-shortcut, G_CALLBACK (xfce_keyboard_settings_validate_shortcut), settings); - - /* Try to keep the window above as it grabs the keyboard, we don't - * want users to wonder why the keyboard does not work in another - * window */ - gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE); - response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG (dialog), gtk_widget_get_toplevel (GTK_WIDGET (tree_view))); if (G_LIKELY (response == GTK_RESPONSE_OK)) @@ -1008,11 +1002,6 @@ xfce_keyboard_settings_add_button_clicked (XfceKeyboardSettings *settings, shortcut_dialog = xfce_shortcut_dialog_new (commands, command, command); g_signal_connect (shortcut_dialog, validate-shortcut, G_CALLBACK (xfce_keyboard_settings_validate_shortcut), settings); - /* Try to keep the window above as it grabs the keyboard, we don't - * want users to wonder why the keyboard does not work in another - * window */ - gtk_window_set_keep_above (GTK_WINDOW (shortcut_dialog), TRUE); - /* Run shortcut dialog until a valid shortcut is entered or the dialog is cancelled */ parent = gtk_builder_get_object (GTK_BUILDER (settings), keyboard-shortcuts-dialog); response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG (shortcut_dialog), GTK_WIDGET (parent)); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:jeromeg/keyboard-shortcuts Fix treeview update when handling conflict (bug #8856).
Updating branch refs/heads/jeromeg/keyboard-shortcuts
to 849aa7824f8a482496c05b1fd77099e062d1c92b (commit)
from 5e1aedff6e3b9b84429d38db4f0558d423cf7d08 (commit)
commit 849aa7824f8a482496c05b1fd77099e062d1c92b
Author: Jérôme Guelfucci jero...@xfce.org
Date: Thu Dec 20 00:02:17 2012 +0100
Fix treeview update when handling conflict (bug #8856).
In a conflict, when we chose to use the new command for the shortcut, we
need to remove the old shortcut manually from the treeview because the
signals are not necessarilly received in the logical order.
dialogs/keyboard-settings/xfce-keyboard-settings.c | 23 ++-
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c
b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 917e35e..1e83e75 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -789,7 +789,7 @@ xfce_keyboard_settings_validate_shortcut
(XfceShortcutDialog *dialog,
if (G_UNLIKELY (g_utf8_collate (shortcut, Return) == 0 || g_utf8_collate
(shortcut, space) == 0))
return FALSE;
- DBG (shortcut = %s, shortcut);
+ DBG (Validating shortcut = %s, shortcut);
property = g_strconcat (CUSTOM_BASE_PROPERTY, /, shortcut, NULL);
info = xfce_keyboard_settings_get_shortcut_info (settings, shortcut,
property);
@@ -805,9 +805,23 @@ xfce_keyboard_settings_validate_shortcut
(XfceShortcutDialog *dialog,
FALSE);
if (G_UNLIKELY (response == GTK_RESPONSE_ACCEPT))
+{
+/* We want to use the shortcut with the new owner */
+DBG (We want to use %s with %s, shortcut,
+ xfce_shortcut_dialog_get_action_name (dialog));
xfce_shortcuts_provider_reset_shortcut (info-provider, shortcut);
+
+/*Remove the shortcut manually from the treeview */
+xfce_keyboard_settings_shortcut_removed (settings-priv-provider,
+ shortcut,
+ settings);
+}
else
-accepted = FALSE;
+{
+ /* We want to keep the old owner */
+ DBG (We want to keep using %s with %s, shortcut,
info-shortcut-command);
+ accepted = FALSE;
+}
xfce_keyboard_settings_free_shortcut_info (info);
}
@@ -899,6 +913,8 @@ xfce_keyboard_settings_shortcut_added
(XfceShortcutsProvider *provider,
gtk_accelerator_parse (sc-shortcut, keyval, modifiers);
label = gtk_accelerator_get_label (keyval, modifiers);
+ DBG (Add shortcut %s for command %s, shortcut, sc-command);
+
gtk_list_store_set (GTK_LIST_STORE (model), iter,
SHORTCUT_COLUMN, shortcut,
COMMAND_COLUMN, sc-command,
@@ -951,6 +967,8 @@ xfce_keyboard_settings_shortcut_removed
(XfceShortcutsProvider *provider,
view = gtk_builder_get_object (GTK_BUILDER (settings), kbd_shortcuts_view);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
+ DBG (Remove shortcut %s from treeview, shortcut);
+
gtk_tree_model_foreach (model, (GtkTreeModelForeachFunc)
_xfce_keyboard_settings_remove_shortcut,
(gpointer) shortcut);
}
@@ -1013,6 +1031,7 @@ xfce_keyboard_settings_add_button_clicked
(XfceKeyboardSettings *settings,
shortcut = xfce_shortcut_dialog_get_shortcut (XFCE_SHORTCUT_DIALOG
(shortcut_dialog));
/* Save the new shortcut to xfconf */
+ DBG (Save shortcut %s with command %s to Xfconf, shortcut,
command);
xfce_shortcuts_provider_set_shortcut (settings-priv-provider,
shortcut, command, snotify);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Applied additional screensaver patch from Jerome Guelfucci.
Updating branch refs/heads/master
to 7cc6567948f96b7e8e696136dfb6e0dfde6a23e3 (commit)
from b62b8cb6e89d3b40b8e1d1e3d6a714c3baa2acf8 (commit)
commit 7cc6567948f96b7e8e696136dfb6e0dfde6a23e3
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 19 18:18:17 2012 -0500
Applied additional screensaver patch from Jerome Guelfucci.
src/common/parole-screensaver.c | 14 ++
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/common/parole-screensaver.c b/src/common/parole-screensaver.c
index 880785e..edfe455 100644
--- a/src/common/parole-screensaver.c
+++ b/src/common/parole-screensaver.c
@@ -72,11 +72,10 @@ parole_screen_saver_new (void)
void parole_screen_saver_inhibit (ParoleScreenSaver *saver, GtkWindow *window)
{
gchar *cmd;
-
+
g_return_if_fail (PAROLE_IS_SCREENSAVER (saver));
-cmd = g_strdup_printf(xdg-screensaver suspend %d,
(int)GDK_WINDOW_XID(GDK_WINDOW(GTK_WIDGET(window)-window)));
-//cmd = g_strdup_printf(xdg-screensaver suspend %d,
(int)GDK_WINDOW_XID(GDK_WINDOW(
gtk_widget_get_parent_window(GTK_WIDGET(window)) )));
+cmd = g_strdup_printf(xdg-screensaver suspend %lu, GDK_DRAWABLE_XID
(gtk_widget_get_window (GTK_WIDGET (window;
system(cmd);
g_free(cmd);
@@ -85,12 +84,11 @@ void parole_screen_saver_inhibit (ParoleScreenSaver *saver,
GtkWindow *window)
void parole_screen_saver_uninhibit (ParoleScreenSaver *saver, GtkWindow
*window)
{
gchar *cmd;
-
+
g_return_if_fail (PAROLE_IS_SCREENSAVER (saver));
-
-cmd = g_strdup_printf(xdg-screensaver resume %d,
(int)GDK_WINDOW_XID(GDK_WINDOW(GTK_WIDGET(window)-window)));
-//cmd = g_strdup_printf(xdg-screensaver resume %d,
(int)GDK_WINDOW_XID(GDK_WINDOW(
gtk_widget_get_parent_window(GTK_WIDGET(window)) )));
+
+cmd = g_strdup_printf(xdg-screensaver resume %lu, GDK_DRAWABLE_XID
(gtk_widget_get_window (GTK_WIDGET (window;
system(cmd);
-
+
g_free(cmd);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Merge branch 'master' of ssh://git.xfce.org/apps/parole
Updating branch refs/heads/master to 7a84c5464f721ab7c4b412425eb6d78019b14a4b (commit) from 7cc6567948f96b7e8e696136dfb6e0dfde6a23e3 (commit) commit 7a84c5464f721ab7c4b412425eb6d78019b14a4b Merge: 7cc6567 470cd00 Author: Sean Davis smd.seanda...@gmail.com Date: Wed Dec 19 18:18:30 2012 -0500 Merge branch 'master' of ssh://git.xfce.org/apps/parole commit 470cd007f50d9490dd37a11fa838448e4ff92b92 Author: Cristian Marchi cri.pe...@gmail.com Date: Wed Dec 19 21:23:02 2012 +0100 l10n: Updated Italian (it) translation to 99% New status: 213 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 105 +++-- 1 files changed, 60 insertions(+), 45 deletions(-) diff --git a/po/it.po b/po/it.po index 3f38517..15c4ed1 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: Parole\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-12-10 18:06+\n +POT-Creation-Date: 2012-12-19 16:06+\n PO-Revision-Date: 2010-02-19 09:04+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n Language-Team: Italian Translation Team xfce-it-translat...@googlegroups.com\n @@ -42,13 +42,17 @@ msgstr 4:3 (TV) msgid bigspan color='#BB'iby/i/span span color='#F4F4F4'Unknown Artist/span/big -msgstr bigspan color='#BB'iby/i/span span color='#F4F4F4'Artista sconosciuto/span/big +msgstr +bigspan color='#BB'iby/i/span span color='#F4F4F4'Artista +sconosciuto/span/big #: ../data/interfaces/parole.ui.h:5 msgid bigspan color='#BB'ion/i/span span color='#F4F4F4'Unknown Album/span/big -msgstr bigspan color='#BB'ion/i/span span color='#F4F4F4'Album sconosciuto/span/big +msgstr +bigspan color='#BB'ion/i/span span color='#F4F4F4'Album +sconosciuto/span/big #: ../data/interfaces/parole.ui.h:6 msgid span color='#F4F4F4'bbigUnknown Song/big/b/span @@ -71,12 +75,12 @@ msgstr Auto msgid Buffering (0%) msgstr Buffering (0%) -#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:707 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:708 msgid Empty msgstr Vuota -#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:111 -#: ../src/parole-disc.c:157 +#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:110 +#: ../src/parole-disc.c:156 msgid Insert Disc msgstr Inserire disco @@ -201,27 +205,36 @@ msgid DVD Name msgstr Nome DVD #: ../data/interfaces/playlist.ui.h:7 +msgid Disc Playlist +msgstr Scaletta disco + +#: ../data/interfaces/playlist.ui.h:8 msgid Play opened files msgstr Avvia la riproduzione dei file aperti -#: ../data/interfaces/playlist.ui.h:8 +#: ../data/interfaces/playlist.ui.h:9 ../src/parole-medialist.c:785 +#: ../src/parole-player.c:2960 +msgid Playlist +msgstr Scaletta + +#: ../data/interfaces/playlist.ui.h:10 #: ../data/interfaces/parole-settings.ui.h:17 msgid Remember playlist msgstr Ricorda scaletta -#: ../data/interfaces/playlist.ui.h:9 +#: ../data/interfaces/playlist.ui.h:11 msgid Repeat msgstr Ripeti -#: ../data/interfaces/playlist.ui.h:10 +#: ../data/interfaces/playlist.ui.h:12 msgid Replace playlist when opening files msgstr Sostituisci la scaletta all'apertura dei file -#: ../data/interfaces/playlist.ui.h:11 +#: ../data/interfaces/playlist.ui.h:13 msgid Shuffle msgstr Casuale -#: ../data/interfaces/playlist.ui.h:12 +#: ../data/interfaces/playlist.ui.h:14 msgid Title Menu msgstr Menu titolo @@ -382,7 +395,7 @@ msgstr Messaggio msgid Error msgstr Errore -#: ../src/gst/parole-gst.c:1239 ../src/parole-medialist.c:344 +#: ../src/gst/parole-gst.c:1239 ../src/parole-medialist.c:357 #, c-format msgid Track %i msgstr Traccia %i @@ -543,32 +556,32 @@ msgstr msgid Supported files msgstr File supportati -#: ../src/parole-mediachooser.c:217 ../src/parole-player.c:920 +#: ../src/parole-mediachooser.c:217 ../src/parole-player.c:921 msgid All files msgstr Tutti i file -#: ../src/parole-medialist.c:360 +#: ../src/parole-medialist.c:373 #, c-format msgid Chapter %i msgstr Capitolo %i -#: ../src/parole-medialist.c:630 +#: ../src/parole-medialist.c:643 msgid Permission denied msgstr Permesso negato -#: ../src/parole-medialist.c:632 +#: ../src/parole-medialist.c:645 msgid Error saving playlist file msgstr Errore nel salvataggio del file della scaletta -#: ../src/parole-medialist.c:644 +#: ../src/parole-medialist.c:657 msgid Unknown playlist format msgstr Formato scaletta sconosciuto -#: ../src/parole-medialist.c:645 +#: ../src/parole-medialist.c:658 msgid Please chooser a supported playlist format msgstr Selezionare un formato di scaletta supportato -#: ../src/parole-medialist.c:697 ../src/parole-plugins-manager.c:349 +#: ../src/parole-medialist.c:710 ../src/parole-plugins-manager.c:349 #: ../src/plugins/properties/stream-properties-provider.c:140 #:
[Xfce4-commits] parole:master Dropped Stream Properties plugin, obsoleted by audiobox widget.
Updating branch refs/heads/master
to f538f9c6f939a959c98ecbafa647653f22f7514b (commit)
from 7a84c5464f721ab7c4b412425eb6d78019b14a4b (commit)
commit f538f9c6f939a959c98ecbafa647653f22f7514b
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 19 18:37:37 2012 -0500
Dropped Stream Properties plugin, obsoleted by audiobox widget.
configure.ac.in| 14 -
po/POTFILES.in |4 -
src/plugins/Makefile.am|4 -
src/plugins/properties/Makefile.am | 51 --
src/plugins/properties/stream-properties-plugin.c | 45 --
.../properties/stream-properties-provider.c| 556
.../properties/stream-properties-provider.h| 44 --
.../properties/stream-properties.desktop.in|6 -
8 files changed, 0 insertions(+), 724 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 143b089..5331f4a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -179,14 +179,6 @@ fi
# Check plugins to build #
#===#
-# Stream Properties plugin.
-#--
-AC_ARG_ENABLE([properties-plugin],
AC_HELP_STRING([--disable-properties-plugin], [Don't build parole stream
properties plugin]),
- [ac_properties_plugin=$enableval], [ac_properties_plugin=yes])
-AC_MSG_CHECKING([whether to build the Parole stream properties plugin])
-AM_CONDITIONAL([PAROLE_PROPERTIES_PLUGIN], [test x$ac_properties_plugin =
xyes])
-AC_MSG_RESULT([$ac_properties_plugin])
-
# Tray plugin.
#--
AC_ARG_ENABLE([tray-plugin], AC_HELP_STRING([--disable-tray-plugin], [Don't
build parole tray icon plugin]),
@@ -242,7 +234,6 @@ src/gst/Makefile
src/dbus/Makefile
src/plugins/Makefile
src/plugins/sample/Makefile
-src/plugins/properties/Makefile
src/plugins/tray/Makefile
src/plugins/power-manager/Makefile
docs/Makefile
@@ -270,11 +261,6 @@ echo
Plugins to build:
=
- Stream Properties: ${ac_properties_plugin}
- if test x${ac_properties_plugin} = xyes; then
- echo (With taglib $TAGLIB_FOUND)
- fi
- echo
System Tray icon: ${ac_tray_plugin}
if test x${ac_tray_plugin} = xyes; then
echo (With notification $LIBNOTIFY_FOUND)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 25d68ae..03fcd22 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,10 +20,6 @@ src/parole-open-location.c
src/parole-plugins-manager.c
src/misc/parole-filters.c
src/misc/parole-pl-parser.c
-src/plugins/properties/stream-properties-plugin.c
-src/plugins/properties/stream-properties-provider.c
-src/plugins/properties/stream-properties-provider.h
-src/plugins/properties/stream-properties.desktop.in
src/plugins/tray/tray-plugin.c
src/plugins/tray/tray-provider.c
src/plugins/tray/tray-provider.h
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index e5de6c1..753feaf 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,9 +1,5 @@
SUBDIRS = sample
-if PAROLE_PROPERTIES_PLUGIN
-SUBDIRS+=properties
-endif
-
if PAROLE_TRAY_PLUGIN
SUBDIRS+=tray
endif
diff --git a/src/plugins/properties/Makefile.am
b/src/plugins/properties/Makefile.am
deleted file mode 100644
index 0ee2ec8..000
--- a/src/plugins/properties/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-INCLUDES = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/src \
- -DG_LOG_DOMAIN=\stream_properties\\
- -DLIBEXECDIR=\$(libexecdir)\ \
- -DPACKAGE_LOCALE_DIR=\$(localedir)\
-
-pluginsdir = \
- $(libdir)/parole-$(PAROLE_VERSION_API)
-
-plugins_LTLIBRARIES = \
- stream-properties.la
-
-stream_properties_la_SOURCES = \
- stream-properties-plugin.c \
- stream-properties-provider.c\
- stream-properties-provider.h
-
-stream_properties_la_CFLAGS = \
- $(PLATFORM_CFLAGS) \
- $(GTK_CFLAGS) \
- $(TAGLIBC_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS)
-
-stream_properties_la_LIBADD = \
- $(top_builddir)/src/misc/libparole.la \
- $(GMODULE_LIBS) \
- $(GTK_LIBS) \
- $(LIBXFCE4UTIL_LIBS)\
- $(TAGLIBC_LIBS)
-
-stream_properties_la_LDFLAGS = \
- -avoid-version \
- -export-dynamic \
- -module \
- $(PLATFORM_LDFLAGS)
-
-#
-# .desktop file
-#
[Xfce4-commits] parole:master Small fix for not displaying the dvd menu when playlist is shown.
Updating branch refs/heads/master
to 1c115d42f0eaaaf23cc3033649aeeb3111a0da91 (commit)
from f538f9c6f939a959c98ecbafa647653f22f7514b (commit)
commit 1c115d42f0eaaaf23cc3033649aeeb3111a0da91
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 19 18:46:46 2012 -0500
Small fix for not displaying the dvd menu when playlist is shown.
src/parole-player.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index 6d6b651..3fddfa4 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -440,7 +440,7 @@ void parole_player_set_playlist_visible (ParolePlayer
*player, gboolean visibili
}
else
{
- gtk_widget_hide_all (player-priv-playlist_nt);
+ gtk_widget_hide (player-priv-playlist_nt);
gtk_image_set_from_stock( GTK_IMAGE(
player-priv-show_hide_playlist_image ), gtk-go-back,
GTK_ICON_SIZE_LARGE_TOOLBAR );
gtk_widget_set_tooltip_text( GTK_WIDGET(
player-priv-show_hide_playlist_button ), Show playlist);
g_object_set (G_OBJECT (player-priv-conf),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] terminal:master l10n: Updated German (de) translation to 98%
Updating branch refs/heads/master to 3d86b95c4e80b555dcdd62b216dfcffe67acf7df (commit) from 4150b0dae1636205663869b56a1a939fd7c5b4bc (commit) commit 3d86b95c4e80b555dcdd62b216dfcffe67acf7df Author: Christoph Wickert christoph.wick...@googlemail.com Date: Thu Dec 20 01:28:54 2012 +0100 l10n: Updated German (de) translation to 98% New status: 258 messages complete with 4 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/de.po | 562 ++ 1 files changed, 312 insertions(+), 250 deletions(-) diff --git a/po/de.po b/po/de.po index 4a2843e..f3a8ebf 100644 --- a/po/de.po +++ b/po/de.po @@ -5,12 +5,12 @@ # Fabian Nowak timyst...@arcor.de, 2006-2008. # Enrico Tröger enr...@xfce.org, 2009. # Jakob Kramer jakob.kra...@gmx.de, 2012. -# +# msgid msgstr Project-Id-Version: Terminal 0.2.12\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-04-25 11:51+\n +POT-Creation-Date: 2012-12-19 21:48+\n PO-Revision-Date: 2012-04-25 16:33+0200\n Last-Translator: Jakob Kramer jakob.kra...@gmx.de\n Language-Team: German xfce-i18n...@xfce.org\n @@ -20,101 +20,101 @@ msgstr Language: de\n Plural-Forms: nplurals=2; plural=(n != 1);\n -#: ../terminal/main.c:52 +#: ../terminal/main.c:51 msgid Usage: msgstr Aufruf: -#: ../terminal/main.c:52 +#: ../terminal/main.c:51 msgid OPTION msgstr OPTION -#: ../terminal/main.c:57 +#: ../terminal/main.c:56 msgid General Options msgstr Allgemeine Einstellungen #. parameter of --default-display #. parameter of --display -#: ../terminal/main.c:59 ../terminal/main.c:85 +#: ../terminal/main.c:58 ../terminal/main.c:84 msgid display msgstr Anzeige #. parameter of --default-working-directory #. parameter of --working-directory -#: ../terminal/main.c:61 ../terminal/main.c:76 +#: ../terminal/main.c:60 ../terminal/main.c:75 msgid directory msgstr Verzeichnis -#: ../terminal/main.c:65 +#: ../terminal/main.c:64 msgid Window or Tab Separators msgstr Fenster und Reiter trennen: -#: ../terminal/main.c:70 +#: ../terminal/main.c:69 msgid Tab Options msgstr Reitereinstellungen #. parameter of --command -#: ../terminal/main.c:72 +#: ../terminal/main.c:71 msgid command msgstr Befehl #. parameter of --title -#: ../terminal/main.c:74 +#: ../terminal/main.c:73 msgid title msgstr Titel -#: ../terminal/main.c:83 +#: ../terminal/main.c:82 msgid Window Options msgstr Fenstereinstellungen #. parameter of --geometry -#: ../terminal/main.c:87 +#: ../terminal/main.c:86 msgid geometry msgstr Abmessungen #. parameter of --role -#: ../terminal/main.c:89 +#: ../terminal/main.c:88 msgid role msgstr Rolle #. parameter of --startup-id -#: ../terminal/main.c:91 +#: ../terminal/main.c:90 msgid string msgstr Zeichenkette #. parameter of --icon -#: ../terminal/main.c:93 +#: ../terminal/main.c:92 msgid icon msgstr Symbol -#: ../terminal/main.c:95 +#: ../terminal/main.c:94 #, c-format msgid See the %s man page for full explanation of the options above. msgstr Lesen Sie die Manpage von %s für eine ausführliche Erklärung des Obigen. -#: ../terminal/main.c:126 ../terminal/terminal-preferences.c:1274 -#: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.in.h:1 +#: ../terminal/main.c:124 ../terminal/terminal-preferences.c:1189 +#: ../terminal/terminal-shortcut-editor.c:119 ../Terminal.desktop.in.in.h:1 msgid Terminal msgstr Terminal -#: ../terminal/main.c:147 +#: ../terminal/main.c:145 msgid The Xfce development team. All rights reserved. msgstr Das Xfce-Entwicklerteam. Alle Rechte vorbehalten. -#: ../terminal/main.c:148 +#: ../terminal/main.c:146 msgid Written by Benedikt Meurer be...@xfce.org msgstr Geschrieben von Benedikt Meurer be...@xfce.org -#: ../terminal/main.c:149 +#: ../terminal/main.c:147 msgid and Nick Schermer n...@xfce.org. msgstr und Nick Schermer n...@xfce.org -#: ../terminal/main.c:150 +#: ../terminal/main.c:148 #, c-format msgid Please report bugs to %s. msgstr Bitte melden Sie Fehler an %s. -#: ../terminal/main.c:249 +#: ../terminal/main.c:244 #, c-format msgid Unable to register terminal service: %s\n msgstr Fehler beim Registrieren des Terminaldienstes: %s\n @@ -144,11 +144,11 @@ msgstr msgid Unable to register object %s msgstr Das D-Bus-Objekt »%s« konnte nicht registriert werden -#: ../terminal/terminal-dialogs.c:90 ../Terminal-default-apps.xml.in.in.h:1 +#: ../terminal/terminal-dialogs.c:84 ../Terminal-default-apps.xml.in.in.h:1 msgid Xfce Terminal Emulator msgstr Xfce Terminal-Emulator -#: ../terminal/terminal-dialogs.c:97 +#: ../terminal/terminal-dialogs.c:91 msgid translator-credits msgstr Benedikt Meurer be...@xfce.org\n @@ -157,10 +157,86 @@ msgstr Paul Seyfert pseyf...@mathphys.fsk.uni-heidelberg.de\n and some more -#: ../terminal/terminal-dialogs.c:100 +#: ../terminal/terminal-dialogs.c:94 msgid Visit Terminal website msgstr
