commit 89204c6ee124165006332dc0275463ce78fd309a
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Tue Aug 31 21:56:36 2010 +0100
Ensure confirmation dialog icon can be found
data/glade/gtkpod.glade | 125 +++++++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 43 deletions(-)
---
diff --git a/data/glade/gtkpod.glade b/data/glade/gtkpod.glade
index be6138a..df7cc7a 100644
--- a/data/glade/gtkpod.glade
+++ b/data/glade/gtkpod.glade
@@ -5,7 +5,6 @@
<widget class="GtkDialog" id="confirm_dialog">
<property name="border_width">6</property>
<property name="title" translatable="yes"> </property>
- <property name="icon">../icons/48x48/gtkpod.png</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -194,20 +193,22 @@
<widget class="GtkWindow" id="spl_window">
<property name="title" translatable="yes">Smart Playlist</property>
<child>
- <widget class="GtkVBox" id="vbox28"><property
name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <widget class="GtkVBox" id="vbox28">
<property name="visible">True</property>
<property name="border_width">5</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="vbox63"><property
name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <widget class="GtkVBox" id="vbox63">
<property name="visible">True</property>
<property name="border_width">7</property>
+ <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<widget class="GtkFrame" id="frame17">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment35">
<property name="visible">True</property>
@@ -229,11 +230,12 @@
<property name="items" translatable="yes">Any
rules
All rules
Ignore rules</property>
- <signal handler="spl_match_rules_changed"
name="changed"/>
+ <signal name="changed"
handler="spl_match_rules_changed"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -242,7 +244,7 @@ Ignore rules</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -256,6 +258,7 @@ Ignore rules</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -263,7 +266,7 @@ Ignore rules</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -277,24 +280,24 @@ Ignore rules</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="spl_name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -312,27 +315,31 @@ Ignore rules</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkFrame" id="spl_rules_frame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment34">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox30"><property
name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <widget class="GtkVBox" id="vbox30">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkScrolledWindow"
id="scrolledwindow16">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="hscrollbar_policy">never</property>
+ <property
name="vscrollbar_policy">automatic</property>
<child>
<widget class="GtkViewport" id="viewport10">
<property name="visible">True</property>
@@ -347,6 +354,9 @@ Ignore rules</property>
</widget>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
</child>
@@ -373,15 +383,16 @@ Ignore rules</property>
<widget class="GtkFrame" id="frame18">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
<widget class="GtkAlignment" id="alignment33">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox28"><property
name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox62">
@@ -389,16 +400,17 @@ Ignore rules</property>
<property name="spacing">12</property>
<child>
<widget class="GtkCheckButton"
id="spl_checklimits_button">
+ <property name="label"
translatable="yes">_Limit to</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label"
translatable="yes">_Limit to</property>
+ <property
name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -406,7 +418,6 @@ Ignore rules</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">12</property>
- <property name="invisible_char">*</property>
<property name="width_chars">6</property>
</widget>
<packing>
@@ -427,6 +438,7 @@ Ignore rules</property>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -445,6 +457,7 @@ Ignore rules</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -467,11 +480,11 @@ Ignore rules</property>
</child>
<child>
<widget class="GtkCheckButton"
id="spl_matchcheckedonly_button">
+ <property name="label" translatable="yes">Match
only _checked tracks</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Match
only _checked tracks</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -482,11 +495,11 @@ Ignore rules</property>
</child>
<child>
<widget class="GtkCheckButton"
id="spl_liveupdate_button">
+ <property name="label" translatable="yes">Live
_updating</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Live
_updating</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -517,32 +530,42 @@ Ignore rules</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox11">
<property name="visible">True</property>
<property name="spacing">6</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="spl_cancel_button">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="spl_ok_button">
+ <property name="label">gtk-save</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-save</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -562,14 +585,15 @@ Ignore rules</property>
<property name="title" translatable="yes"> </property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox16"><property
name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <widget class="GtkVBox" id="dialog-vbox16">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<widget class="GtkHBox" id="hbox184">
@@ -583,17 +607,19 @@ Ignore rules</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-question</property>
- <property name="icon_size">6</property>
+ <property name="icon-size">6</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox42"><property
name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <widget class="GtkVBox" id="vbox42">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="input_box_label">
@@ -609,6 +635,7 @@ The quick brown fox jumps over the lazy dog.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -617,9 +644,10 @@ The quick brown fox jumps over the lazy dog.</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox45"><property
name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <widget class="GtkVBox" id="vbox45">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkEntry" id="input_box_entry">
@@ -630,15 +658,16 @@ The quick brown fox jumps over the lazy dog.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton"
id="input_box_checkbox">
+ <property name="label">checkbutton</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="label">checkbutton</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -670,11 +699,12 @@ The quick brown fox jumps over the lazy dog.</property>
<widget class="GtkHButtonBox" id="dialog-action_area16">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -685,9 +715,10 @@ The quick brown fox jumps over the lazy dog.</property>
<property name="title" translatable="yes">Progress Information</property>
<property name="skip_taskbar_hint">True</property>
<child>
- <widget class="GtkVBox" id="vbox180"><property
name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <widget class="GtkVBox" id="vbox180">
<property name="visible">True</property>
<property name="border_width">5</property>
+ <property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<widget class="GtkLabel" id="textlabel">
@@ -698,6 +729,7 @@ The quick brown fox jumps over the lazy dog.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -729,15 +761,20 @@ The quick brown fox jumps over the lazy dog.</property>
<property name="visible">True</property>
<child>
<widget class="GtkButton" id="abortbutton">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
+ <property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Export can be
continued at a later time if canceled.</property>
<property name="border_width">2</property>
- <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
@@ -753,8 +790,9 @@ The quick brown fox jumps over the lazy dog.</property>
<property name="border_width">4</property>
<property name="title" translatable="yes">Conversion Progress
Display</property>
<child>
- <widget class="GtkVBox" id="conversion_vbox"><property
name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <widget class="GtkVBox" id="conversion_vbox">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<widget class="GtkLabel" id="label463">
@@ -767,6 +805,7 @@ The quick brown fox jumps over the lazy dog.</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">8</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -779,7 +818,7 @@ The quick brown fox jumps over the lazy dog.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
