summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Ghedini <al3xbio@gmail.com>2012-01-27 21:34:49 +0100
committerAlessandro Ghedini <al3xbio@gmail.com>2012-01-27 21:34:49 +0100
commit2f94591b0eca0f910484a8073403cf71f274d974 (patch)
tree1eb06c396330950fdfd95fc3358e2e3055fd1e10
parentd67c54cea574bf6bb014d3e2412bd64c7ced2073 (diff)
parenta824c3e5bdab686901b02667609282e7d596a6af (diff)
Merge commit 'upstream/0.4.2'
-rw-r--r--resources/ui/icon_select.ui2
-rw-r--r--resources/ui/preferences.ui2
-rw-r--r--resources/ui/rename_pie.ui2
-rw-r--r--resources/ui/settings.ui2
-rw-r--r--resources/ui/slice_select.ui2
-rw-r--r--resources/ui/trigger_select.ui2
-rw-r--r--src/gui/aboutWindow.vala2
-rw-r--r--src/gui/pieComboList.vala2
-rw-r--r--src/gui/pieList.vala2
-rw-r--r--src/gui/piePreviewRenderer.vala6
-rw-r--r--src/gui/sliceTypeList.vala8
-rw-r--r--src/gui/themeList.vala6
-rw-r--r--src/renderers/pieWindow.vala2
-rw-r--r--src/utilities/trigger.vala6
14 files changed, 22 insertions, 24 deletions
diff --git a/resources/ui/icon_select.ui b/resources/ui/icon_select.ui
index d740091..b39ea2a 100644
--- a/resources/ui/icon_select.ui
+++ b/resources/ui/icon_select.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.24"/>
+ <requires lib="gtk+" version="2.20"/>
<object class="GtkWindow" id="window">
<property name="width_request">525</property>
<property name="height_request">425</property>
diff --git a/resources/ui/preferences.ui b/resources/ui/preferences.ui
index e814acf..8ee988c 100644
--- a/resources/ui/preferences.ui
+++ b/resources/ui/preferences.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.20"/>
<object class="GtkWindow" id="window">
<property name="width_request">600</property>
<property name="height_request">475</property>
diff --git a/resources/ui/rename_pie.ui b/resources/ui/rename_pie.ui
index b8bcc9e..4536598 100644
--- a/resources/ui/rename_pie.ui
+++ b/resources/ui/rename_pie.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.24"/>
+ <requires lib="gtk+" version="2.20"/>
<object class="GtkDialog" id="window">
<property name="width_request">350</property>
<property name="can_focus">False</property>
diff --git a/resources/ui/settings.ui b/resources/ui/settings.ui
index 8c3f13a..889124a 100644
--- a/resources/ui/settings.ui
+++ b/resources/ui/settings.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.24"/>
+ <requires lib="gtk+" version="2.20"/>
<object class="GtkDialog" id="window">
<property name="width_request">550</property>
<property name="height_request">450</property>
diff --git a/resources/ui/slice_select.ui b/resources/ui/slice_select.ui
index 639447c..6ea5087 100644
--- a/resources/ui/slice_select.ui
+++ b/resources/ui/slice_select.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.24"/>
+ <requires lib="gtk+" version="2.20"/>
<object class="GtkDialog" id="window">
<property name="width_request">550</property>
<property name="height_request">450</property>
diff --git a/resources/ui/trigger_select.ui b/resources/ui/trigger_select.ui
index 5a0deec..9967997 100644
--- a/resources/ui/trigger_select.ui
+++ b/resources/ui/trigger_select.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.24"/>
+ <requires lib="gtk+" version="2.20"/>
<object class="GtkDialog" id="window">
<property name="width_request">350</property>
<property name="can_focus">False</property>
diff --git a/src/gui/aboutWindow.vala b/src/gui/aboutWindow.vala
index e7faca3..2df8c46 100644
--- a/src/gui/aboutWindow.vala
+++ b/src/gui/aboutWindow.vala
@@ -68,7 +68,7 @@ public class AboutWindow: Gtk.AboutDialog {
logo_icon_name: "gnome-pie",
website: "http://www.simonschneegans.de/?page_id=12",
website_label: "www.gnome-pie.simonschneegans.de",
- version: "0.4.1"
+ version: "0.4.2"
);
}
}
diff --git a/src/gui/pieComboList.vala b/src/gui/pieComboList.vala
index 3b54944..3be3bff 100644
--- a/src/gui/pieComboList.vala
+++ b/src/gui/pieComboList.vala
@@ -65,7 +65,7 @@ class PieComboList : Gtk.ComboBox {
this.pack_start(name_render, true);
this.add_attribute(icon_render, "pixbuf", DataPos.ICON);
- this.add_attribute(name_render, "markup", DataPos.NAME);
+ this.add_attribute(name_render, "text", DataPos.NAME);
this.changed.connect(() => {
Gtk.TreeIter active;
diff --git a/src/gui/pieList.vala b/src/gui/pieList.vala
index bfcb832..474e5f5 100644
--- a/src/gui/pieList.vala
+++ b/src/gui/pieList.vala
@@ -86,7 +86,7 @@ class PieList : Gtk.TreeView {
base.append_column(main_column);
main_column.add_attribute(icon_render, "pixbuf", DataPos.ICON);
- main_column.add_attribute(name_render, "markup", DataPos.NAME);
+ main_column.add_attribute(name_render, "text", DataPos.NAME);
// setup drag'n'drop
Gtk.TargetEntry uri_source = {"text/uri-list", 0, 0};
diff --git a/src/gui/piePreviewRenderer.vala b/src/gui/piePreviewRenderer.vala
index 1cf83ff..6fff397 100644
--- a/src/gui/piePreviewRenderer.vala
+++ b/src/gui/piePreviewRenderer.vala
@@ -408,7 +408,7 @@ public class PiePreviewRenderer : GLib.Object {
switch (display) {
case CenterDisplay.ACTIVE_SLICE:
if (this.active_slice >= 0 && this.active_slice < this.slices.size)
- this.center_renderer.set_text("<b>" + slices[this.active_slice].name + "</b>\n<small>"
+ this.center_renderer.set_text("<b>" + GLib.Markup.escape_text(slices[this.active_slice].name) + "</b>\n<small>"
+ _("Click to edit") + "\n" + _("Drag to move") + "</small>");
break;
case CenterDisplay.ADD:
@@ -418,12 +418,12 @@ public class PiePreviewRenderer : GLib.Object {
if (hidden_group == null)
this.center_renderer.set_text("<small>" + _("Drop to add as new Slice") + "</small>");
else
- this.center_renderer.set_text("<b>" + this.hidden_group.name + "</b>\n<small>"
+ this.center_renderer.set_text("<b>" + GLib.Markup.escape_text(this.hidden_group.name) + "</b>\n<small>"
+ _("Drop to move Slice") + "</small>");
break;
case CenterDisplay.DELETE:
if (this.active_slice >= 0 && this.active_slice < this.slices.size)
- this.center_renderer.set_text("<b>" + slices[this.active_slice].name + "</b>\n<small>"
+ this.center_renderer.set_text("<b>" + GLib.Markup.escape_text(slices[this.active_slice].name) + "</b>\n<small>"
+ _("Click to delete") + "\n" + _("Drag to move") + "</small>");
break;
default:
diff --git a/src/gui/sliceTypeList.vala b/src/gui/sliceTypeList.vala
index 541658e..b447dc3 100644
--- a/src/gui/sliceTypeList.vala
+++ b/src/gui/sliceTypeList.vala
@@ -103,8 +103,8 @@ class SliceTypeList : Gtk.TreeView {
var icon = new Icon(description.icon, 36);
data.set(current, DataPos.ICON, icon.to_pixbuf());
data.set(current, DataPos.ICON_NAME, description.icon);
- data.set(current, DataPos.NAME, "<b>" + description.name + "</b>\n"
- + "<small>" + description.description + "</small>");
+ data.set(current, DataPos.NAME, "<b>" + GLib.Markup.escape_text(description.name) + "</b>\n"
+ + "<small>" + GLib.Markup.escape_text(description.description) + "</small>");
data.set(current, DataPos.ID, description.id);
}
@@ -116,8 +116,8 @@ class SliceTypeList : Gtk.TreeView {
var icon = new Icon(description.icon, 36);
data.set(current, DataPos.ICON, icon.to_pixbuf());
data.set(current, DataPos.ICON_NAME, description.icon);
- data.set(current, DataPos.NAME, "<b>" + description.name + "</b>\n"
- + "<small>" + description.description + "</small>");
+ data.set(current, DataPos.NAME, "<b>" + GLib.Markup.escape_text(description.name) + "</b>\n"
+ + "<small>" + GLib.Markup.escape_text(description.description) + "</small>");
data.set(current, DataPos.ID, description.id);
}
diff --git a/src/gui/themeList.vala b/src/gui/themeList.vala
index 62e0721..7aaecc6 100644
--- a/src/gui/themeList.vala
+++ b/src/gui/themeList.vala
@@ -82,8 +82,10 @@ class ThemeList : Gtk.TreeView {
Gtk.TreeIter current;
data.append(out current);
data.set(current, DataPos.ICON, theme.preview_icon.to_pixbuf());
- data.set(current, DataPos.NAME, "<b>"+theme.name+"</b><small> - "+theme.description+"\n"
- +"<i>"+_("By")+" "+theme.author+"</i></small>");
+ data.set(current, DataPos.NAME, "<b>"+GLib.Markup.escape_text(theme.name)+"</b><small> - "
+ +GLib.Markup.escape_text(theme.description)+"\n"
+ +"<i>"+GLib.Markup.escape_text(_("By")+" "+theme.author)
+ +"</i></small>");
if(theme == Config.global.theme)
get_selection().select_iter(current);
}
diff --git a/src/renderers/pieWindow.vala b/src/renderers/pieWindow.vala
index 0a26110..54dd691 100644
--- a/src/renderers/pieWindow.vala
+++ b/src/renderers/pieWindow.vala
@@ -79,7 +79,7 @@ public class PieWindow : Gtk.Window {
this.set_skip_taskbar_hint(true);
this.set_skip_pager_hint(true);
this.set_keep_above(true);
- this.set_type_hint(Gdk.WindowTypeHint.UTILITY);
+ this.set_type_hint(Gdk.WindowTypeHint.POPUP_MENU);
this.set_decorated(false);
this.set_resizable(false);
this.icon_name = "gnome-pie";
diff --git a/src/utilities/trigger.vala b/src/utilities/trigger.vala
index 4b6167b..854cbb4 100644
--- a/src/utilities/trigger.vala
+++ b/src/utilities/trigger.vala
@@ -182,11 +182,7 @@ public class Trigger : GLib.Object {
this.label = Gtk.accelerator_get_label(keysym, this.modifiers);
}
- this.label = this.label.replace("<", "&lt;");
- this.label = this.label.replace(">", "&gt;");
- this.label = this.label.replace("&", "&amp;");
-
- this.label_with_specials = this.label;
+ this.label_with_specials = GLib.Markup.escape_text(this.label);
if (this.turbo && this.delayed && this.centered)
this.label_with_specials += (" <small><span weight='light'>[ " + _("Turbo") + " | " + _("Delayed") + " | " + _("Centered") + " ]</span></small>");