Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11700
Modified Files:
Tag: threaded_conversion_branch
ChangeLog_detailed gtkpod.glade
Log Message:
* gtkpod.glade
src/file.h
src/file_itunesdb.c
src/file_convert.[ch]:
src/display.c
src/file.h
src/file_convert.c
src/file_convert.h
src/file_itunesdb.c
src/prefs_window.c
src/info.c: handle closing of window if user
clicks on the 'close-window' buton, general cleanup,
created log window for file conversion output.
Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.415.2.3
retrieving revision 1.415.2.4
diff -u -d -r1.415.2.3 -r1.415.2.4
--- ChangeLog_detailed 21 Apr 2007 08:54:49 -0000 1.415.2.3
+++ ChangeLog_detailed 23 Apr 2007 15:18:25 -0000 1.415.2.4
@@ -1,3 +1,19 @@
+2007-04-23 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * gtkpod.glade
+ src/file.h
+ src/file_itunesdb.c
+ src/file_convert.[ch]:
+ src/display.c
+ src/file.h
+ src/file_convert.c
+ src/file_convert.h
+ src/file_itunesdb.c
+ src/prefs_window.c
+ src/info.c: handle closing of window if user
+ clicks on the 'close-window' buton, general cleanup,
+ created log window for file conversion output.
+
2007-04-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
* gtkpod.glade
Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.231.2.3
retrieving revision 1.231.2.4
diff -u -d -r1.231.2.3 -r1.231.2.4
--- gtkpod.glade 21 Apr 2007 08:54:49 -0000 1.231.2.3
+++ gtkpod.glade 23 Apr 2007 15:18:25 -0000 1.231.2.4
@@ -51,7 +51,7 @@
<signal name="activate" handler="on_load_ipods_mi"
last_modification_time="Sat, 20 May 2006 14:21:46 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3858">
+ <widget class="GtkImage" id="image3926">
<property name="visible">True</property>
<property name="pixbuf">gtkpod-read.png</property>
<property name="xalign">0.5</property>
@@ -71,7 +71,7 @@
<signal name="activate" handler="on_save_changes_mi"
last_modification_time="Sat, 20 May 2006 14:22:12 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3859">
+ <widget class="GtkImage" id="image3927">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon_size">1</property>
@@ -92,7 +92,7 @@
<signal name="activate" handler="create_add_files_dialog"
last_modification_time="Sun, 05 Jun 2005 13:03:47 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3860">
+ <widget class="GtkImage" id="image3928">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -113,7 +113,7 @@
<signal name="activate" handler="dirbrowser_create"
last_modification_time="Sun, 05 Jun 2005 13:09:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3861">
+ <widget class="GtkImage" id="image3929">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -134,7 +134,7 @@
<signal name="activate"
handler="create_add_playlists_dialog" last_modification_time="Sun, 05 Jun 2005
13:14:57 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3862">
+ <widget class="GtkImage" id="image3930">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -160,7 +160,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3863">
+ <widget class="GtkImage" id="image3931">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -212,7 +212,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3864">
+ <widget class="GtkImage" id="image3932">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -265,7 +265,7 @@
<signal name="activate"
handler="on_sync_playlist_activate" last_modification_time="Mon, 15 May 2006
15:39:05 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3865">
+ <widget class="GtkImage" id="image3933">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -291,7 +291,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3866">
+ <widget class="GtkImage" id="image3934">
<property name="visible">True</property>
<property name="stock">gtk-save-as</property>
<property name="icon_size">1</property>
@@ -343,7 +343,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3867">
+ <widget class="GtkImage" id="image3935">
<property name="visible">True</property>
<property name="stock">gtk-save-as</property>
<property name="icon_size">1</property>
@@ -402,7 +402,7 @@
<signal name="activate"
handler="on_ipod_directories_menu" last_modification_time="Sat, 18 Jan 2003
02:10:39 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3868">
+ <widget class="GtkImage" id="image3936">
<property name="visible">True</property>
<property name="stock">gtk-execute</property>
<property name="icon_size">1</property>
@@ -460,7 +460,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3869">
+ <widget class="GtkImage" id="image3937">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
@@ -521,7 +521,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3870">
+ <widget class="GtkImage" id="image3938">
<property name="visible">True</property>
<property name="stock">gtk-delete</property>
<property name="icon_size">1</property>
@@ -672,7 +672,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3871">
+ <widget class="GtkImage" id="image3939">
<property name="visible">True</property>
<property name="stock">gtk-copy</property>
<property name="icon_size">1</property>
@@ -864,7 +864,7 @@
<accelerator key="s" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3872">
+ <widget class="GtkImage" id="image3940">
<property name="visible">True</property>
<property name="stock">gtk-sort-ascending</property>
<property name="icon_size">1</property>
@@ -895,7 +895,7 @@
<accelerator key="s" modifiers="GDK_CONTROL_MASK |
GDK_SHIFT_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3873">
+ <widget class="GtkImage" id="image3941">
<property name="visible">True</property>
<property name="stock">gtk-justify-fill</property>
<property name="icon_size">1</property>
@@ -922,7 +922,7 @@
<signal name="activate"
handler="on_edit_repository_options_activate" last_modification_time="Sun, 21
May 2006 03:40:14 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3874">
+ <widget class="GtkImage" id="image3942">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -944,7 +944,7 @@
<accelerator key="p" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3875">
+ <widget class="GtkImage" id="image3943">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -1002,6 +1002,16 @@
</child>
<child>
+ <widget class="GtkCheckMenuItem" id="conversion_log">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Conversion
Log</property>
+ <property name="use_underline">True</property>
+ <property name="active">False</property>
+ <signal name="activate"
handler="on_conversion_log1_activate" last_modification_time="Sun, 22 Apr 2007
15:25:48 GMT"/>
+ </widget>
+ </child>
+
+ <child>
<widget class="GtkImageMenuItem" id="more_sort_tabs">
<property name="visible">True</property>
<property name="label" translatable="yes">_More Sort
Tabs</property>
@@ -1009,7 +1019,7 @@
<signal name="activate"
handler="on_more_sort_tabs_activate" last_modification_time="Fri, 14 Mar 2003
11:57:43 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3876">
+ <widget class="GtkImage" id="image3944">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -1030,7 +1040,7 @@
<signal name="activate"
handler="on_less_sort_tabs_activate" last_modification_time="Fri, 14 Mar 2003
11:57:43 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3877">
+ <widget class="GtkImage" id="image3945">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
@@ -1072,7 +1082,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3878">
+ <widget class="GtkImage" id="image3946">
<property name="visible">True</property>
<property name="stock">gtk-cdrom</property>
<property name="icon_size">1</property>
@@ -1124,7 +1134,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3879">
+ <widget class="GtkImage" id="image3947">
<property name="visible">True</property>
<property name="stock">gtk-cdrom</property>
<property name="icon_size">1</property>
@@ -1306,7 +1316,7 @@
<signal name="activate" handler="open_about_window"
last_modification_time="Sun, 05 Jun 2005 13:09:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3880">
+ <widget class="GtkImage" id="image3948">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
<property name="icon_size">1</property>
@@ -14300,6 +14310,28 @@
<property name="x_options">fill</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton"
id="file_convert_display_log_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">Display conversion log</property>
+ <property name="use_underline">True</property>
+ <property
name="relief">GTK_RELIEF_NORMAL</property>
+ <property
name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property
name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">8</property>
@@ -20981,11 +21013,10 @@
<widget class="GtkWindow" id="file_transfer_information_dialog">
<property name="border_width">2</property>
- <property name="visible">True</property>
<property name="title" translatable="yes">Progress Information</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">True</property>
+ <property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
@@ -21151,4 +21182,71 @@
</child>
</widget>
+<widget class="GtkWindow" id="conversion_log">
+ <property name="border_width">4</property>
+ <property name="title" translatable="yes">Conversion Progress
Display</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+
+ <child>
+ <widget class="GtkVBox" id="conversion_vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">4</property>
+
+ <child>
+ <widget class="GtkLabel" id="label463">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">The output of the
background conversion scripts is copied below. Each page of the notebook
corresponds to one background thread.</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">8</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <widget class="GtkStatusbar" id="conversion_statusbar">
+ <property name="visible">True</property>
+ <property name="has_resize_grip">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
