[Xfce4-commits] r29476 - in xfce4-mixer/trunk: . xfce4-mixer
Jannis Pohlmann
jannis at xfce.org
Tue Feb 10 15:03:46 CET 2009
Author: jannis
Date: 2009-02-10 14:03:46 +0000 (Tue, 10 Feb 2009)
New Revision: 29476
Modified:
xfce4-mixer/trunk/ChangeLog
xfce4-mixer/trunk/TODO
xfce4-mixer/trunk/configure.in.in
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
Log:
* TODO: Remove a few things from the TODO list.
* configure.in.in: Add the svn version tag back again.
* xfce4-mixer/xfce-mixer.c, xfce4-mixer/xfce-mixer-track.c: Minor
cosmetic fixes (row spacing of 6px in tables).
* xfce4-mixer/xfce-mixer-window.c: Make <Control>q and <Control>s
trigger the corresponding actions.
Modified: xfce4-mixer/trunk/ChangeLog
===================================================================
--- xfce4-mixer/trunk/ChangeLog 2009-02-09 15:42:18 UTC (rev 29475)
+++ xfce4-mixer/trunk/ChangeLog 2009-02-10 14:03:46 UTC (rev 29476)
@@ -1,3 +1,12 @@
+2009-02-10 Jannis Pohlmann <jannis at xfce.org>
+
+ * TODO: Remove a few things from the TODO list.
+ * configure.in.in: Add the svn version tag back again.
+ * xfce4-mixer/xfce-mixer.c, xfce4-mixer/xfce-mixer-track.c: Minor
+ cosmetic fixes (row spacing of 6px in tables).
+ * xfce4-mixer/xfce-mixer-window.c: Make <Control>q and <Control>s
+ trigger the corresponding actions.
+
2009-02-03 Jannis Pohlmann <jannis at xfce.org>
* panel-plugin/xfce-mixer-plugin.c: Use the GstMixerTrack "label"
Modified: xfce4-mixer/trunk/TODO
===================================================================
--- xfce4-mixer/trunk/TODO 2009-02-09 15:42:18 UTC (rev 29475)
+++ xfce4-mixer/trunk/TODO 2009-02-10 14:03:46 UTC (rev 29476)
@@ -1,8 +1,3 @@
-* Use GPLv2 instead of LGPL. Fix this in all the source code files.
-
-* Don't install the xfce4-mixer stock icon. Use the correct icon name
- according to the icon theme naming specification.
-
* Improve the naming of the volume stock icons.
* Improve the plugin icons.
Modified: xfce4-mixer/trunk/configure.in.in
===================================================================
--- xfce4-mixer/trunk/configure.in.in 2009-02-09 15:42:18 UTC (rev 29475)
+++ xfce4-mixer/trunk/configure.in.in 2009-02-10 14:03:46 UTC (rev 29476)
@@ -11,7 +11,7 @@
m4_define([xfce4_mixer_version_micro], [99])
m4_define([xfce4_mixer_version_nano], [1]) dnl leave this empty to have no nano version
m4_define([xfce4_mixer_version_build], [r at REVISION@])
-m4_define([xfce4_mixer_version_tag], [])
+m4_define([xfce4_mixer_version_tag], [svn])
m4_define([xfce4_mixer_version], [xfce4_mixer_version_major().xfce4_mixer_version_minor().xfce4_mixer_version_micro()ifelse(xfce4_mixer_version_nano(), [], [], [.xfce4_mixer_version_nano()])ifelse(xfce4_mixer_version_tag(), [svn], [xfce4_mixer_version_tag()-xfce4_mixer_version_build()], [xfce4_mixer_version_tag()])])
dnl *******************************************
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
===================================================================
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c 2009-02-09 15:42:18 UTC (rev 29475)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c 2009-02-10 14:03:46 UTC (rev 29476)
@@ -199,6 +199,7 @@
/* Put some space between channel faders */
gtk_table_set_col_spacings (GTK_TABLE (track), 6);
+ gtk_table_set_row_spacings (GTK_TABLE (track), 6);
/* Put the name of the track on top of the other elements */
g_object_get (track->gst_track, "label", &track_label, NULL);
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c
===================================================================
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c 2009-02-09 15:42:18 UTC (rev 29475)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c 2009-02-10 14:03:46 UTC (rev 29476)
@@ -81,9 +81,9 @@
static const GtkActionEntry action_entries[] =
{
- { "quit", GTK_STOCK_QUIT, N_ ("_Quit"), "<control>Q", N_ ("Exit the mixer"),
+ { "quit", GTK_STOCK_QUIT, N_ ("_Quit"), "<Control>q", N_ ("Exit the mixer"),
G_CALLBACK (xfce_mixer_window_close) },
- { "select-controls", NULL, N_ ("_Select Controls..."), "<control>S", N_ ("Select which controls are displayed"),
+ { "select-controls", NULL, N_ ("_Select Controls..."), "<Control>s", N_ ("Select which controls are displayed"),
G_CALLBACK (xfce_mixer_window_action_select_controls) },
};
@@ -144,17 +144,20 @@
static void
xfce_mixer_window_init (XfceMixerWindow *window)
{
- GtkWidget *heading;
- GtkWidget *separator;
- GtkWidget *label;
- GtkWidget *button;
- GtkWidget *vbox;
- GtkWidget *hbox;
- GtkWidget *bbox;
- gchar *active_card = NULL;
- gchar *title;
- gint width;
- gint height;
+ GtkAccelGroup *accel_group;
+ GtkAction *action;
+ GtkWidget *heading;
+ GtkWidget *separator;
+ GtkWidget *label;
+ GtkWidget *button;
+ GtkWidget *vbox;
+ GtkWidget *hbox;
+ GtkWidget *bbox;
+ gchar *active_card = NULL;
+ gchar *title;
+ gint width;
+ gint height;
+ gint i;
window->preferences = xfce_mixer_preferences_get ();
@@ -175,6 +178,17 @@
gtk_action_group_set_translation_domain (window->action_group, GETTEXT_PACKAGE);
gtk_action_group_add_actions (window->action_group, action_entries, G_N_ELEMENTS (action_entries), GTK_WIDGET (window));
+ /* Install action accelerators for the mixer window */
+ accel_group = gtk_accel_group_new ();
+ for (i = 0; i < G_N_ELEMENTS (action_entries); ++i)
+ {
+ action = gtk_action_group_get_action (window->action_group, action_entries[i].name);
+ gtk_action_set_accel_group (action, accel_group);
+ gtk_action_connect_accelerator (action);
+ gtk_action_set_sensitive (action, TRUE);
+ }
+ gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_widget_show (vbox);
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
===================================================================
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c 2009-02-09 15:42:18 UTC (rev 29475)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c 2009-02-10 14:03:46 UTC (rev 29476)
@@ -191,6 +191,7 @@
{
views[i] = gtk_table_new (1, 1, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (views[i]), 12);
+ gtk_table_set_row_spacings (GTK_TABLE (views[i]), 6);
}
else
views[i] = gtk_vbox_new (FALSE, 6);
More information about the Xfce4-commits
mailing list