Menu
▾
▴
[gtpd-cvs] SF.net SVN: gtkpod: [1879] gtkpod/trunk
|
From: <Si...@us...> - 2007-12-30 12:52:33
|
Revision: 1879
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1879&view=rev
Author: Sikon
Date: 2007-12-30 04:52:34 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
New prefs dialog landed
Modified Paths:
--------------
gtkpod/trunk/data/gtkpod.glade
gtkpod/trunk/src/prefsdlg.c
Modified: gtkpod/trunk/data/gtkpod.glade
===================================================================
--- gtkpod/trunk/data/gtkpod.glade 2007-12-30 12:04:55 UTC (rev 1878)
+++ gtkpod/trunk/data/gtkpod.glade 2007-12-30 12:52:34 UTC (rev 1879)
@@ -748,24 +748,25 @@
<child>
<widget class="GtkImageMenuItem" id="edit_preferences">
<property name="visible">True</property>
- <property name="label">gtk-preferences</property>
+ <property name="label">Preferences (Legacy)</property>
<property name="use_underline">True</property>
- <property name="use_stock">True</property>
<signal name="activate" handler="on_edit_preferences_activate"/>
- <accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="menu-item-image35">
+ <property name="stock">gtk-preferences</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="preferences_exp">
<property name="visible">True</property>
- <property name="label" translatable="yes">Preferences (Experimental)</property>
+ <property name="label" translatable="yes">gtk-preferences</property>
<property name="use_underline">True</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="open_prefs_dlg"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image25">
- <property name="stock">gtk-preferences</property>
- </widget>
- </child>
+ <accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
</widget>
</child>
</widget>
@@ -1074,6 +1075,7 @@
<widget class="GtkImage" id="menu-item-image24">
<property name="visible">True</property>
<property name="stock">gtk-help</property>
+ <property name="icon_size">1</property>
</widget>
</child>
</widget>
@@ -2521,6 +2523,7 @@
<widget class="GtkWindow" id="sort_window">
<property name="title" translatable="yes">Sorting Options</property>
<property name="icon">gtkpod-icon-48.png</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<signal name="delete_event" handler="on_sort_window_delete_event"/>
<child>
<widget class="GtkVBox" id="vbox52">
@@ -3317,6 +3320,7 @@
<child>
<widget class="GtkComboBox" id="sort_combo">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">You can also use the table headers, but this allows you to sort according to a column that is not displayed.</property>
<property name="items">Dummy - do not delete
</property>
</widget>
@@ -13836,12 +13840,8 @@
<widget class="GtkVButtonBox" id="vbuttonbox2">
<property name="visible">True</property>
<property name="spacing">6</property>
+ <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
<child>
- <widget class="GtkLabel" id="label21">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
<widget class="GtkButton" id="column_add">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -13851,7 +13851,8 @@
<signal name="clicked" handler="on_column_add_clicked"/>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
@@ -13864,15 +13865,70 @@
<signal name="clicked" handler="on_column_remove_clicked"/>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label23">
+ <widget class="GtkButton" id="sorting_button">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">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="response_id">0</property>
+ <signal name="clicked" handler="on_sorting_button_clicked"/>
+ <child>
+ <widget class="GtkHBox" id="hbox64">
+ <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="spacing">2</property>
+ <child>
+ <widget class="GtkLabel" id="label23">
+ <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>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImage" id="image3">
+ <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="stock">gtk-sort-ascending</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label21">
+ <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="label" translatable="yes">Sorting...</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label56">
+ <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>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="position">3</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -16892,6 +16948,7 @@
<property name="label" translatable="yes">Display conversion log</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_simple_checkbox_toggled"/>
</widget>
<packing>
<property name="expand">False</property>
Modified: gtkpod/trunk/src/prefsdlg.c
===================================================================
--- gtkpod/trunk/src/prefsdlg.c 2007-12-30 12:04:55 UTC (rev 1878)
+++ gtkpod/trunk/src/prefsdlg.c 2007-12-30 12:52:34 UTC (rev 1879)
@@ -35,6 +35,7 @@
#include "help.h"
#include "prefs.h"
#include "display_coverart.h"
+#include "prefs_window.h"
/*
Begin types
@@ -343,11 +344,14 @@
GdkColor *color = coverart_get_background_display_colour();
gtk_color_button_set_color (GTK_COLOR_BUTTON(coverart_colorselect_button), color);
- gtk_combo_box_set_active (GTK_COMBO_BOX (gtkpod_xml_get_widget (xml, "toolbar_style")),
+ gtk_combo_box_set_active (GTK_COMBO_BOX (gtkpod_xml_get_widget (xml, "target_format")),
prefs_get_int ("conversion_target_format"));
}
-void open_prefs_dlg ()
+/*
+ glade callback
+*/
+G_MODULE_EXPORT void open_prefs_dlg ()
{
if(prefs_dialog)
{
@@ -1065,5 +1069,14 @@
prefs_set_string (conv_paths[i].string, script);
}
+ prefs_set_int ("conversion_target_format", index);
g_free (script);
}
+
+/*
+ glade callback
+*/
+G_MODULE_EXPORT void on_sorting_button_clicked (GtkButton *sender, gpointer e)
+{
+ sort_window_create ();
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|