changeset 2626:b7ab90e4235e

remove more #if 0's, add ui_hints
author Tomasz Mon <desowin@gmail.com>
date Thu, 22 May 2008 15:15:31 +0200
parents 29526d9db9cc
children c0a35d3d5bb9
files src/skins/Makefile src/skins/ui_hints.c src/skins/ui_hints.h src/skins/ui_main.c
diffstat 4 files changed, 96 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/skins/Makefile	Thu May 22 15:10:00 2008 +0200
+++ b/src/skins/Makefile	Thu May 22 15:15:31 2008 +0200
@@ -27,6 +27,7 @@
        ui_main_evlisteners.c \
        ui_playlist_evlisteners.c \
        ui_manager.c \
+       ui_hints.c \
        icons-stock.c
 
 include ../../buildsys.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/skins/ui_hints.c	Thu May 22 15:15:31 2008 +0200
@@ -0,0 +1,59 @@
+/*  Audacious - Cross-platform multimedia player
+ *  Copyright (C) 2005-2007  Audacious development team
+ *
+ *  Based on BMP:
+ *  Copyright (C) 2003-2004  BMP development team.
+ *
+ *  Based on XMMS:
+ *  Copyright (C) 1998-2003  XMMS development team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; under version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses>.
+ *
+ *  The Audacious team does not consider modular code linking to
+ *  Audacious or using our public API to be a derived work.
+ */
+
+#include "ui_hints.h"
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include "ui_equalizer.h"
+#include "ui_main.h"
+#include "ui_playlist.h"
+
+#include "platform/smartinclude.h"
+
+void
+hint_set_always(gboolean always)
+{
+    gtk_window_set_keep_above(GTK_WINDOW(mainwin), always);
+    gtk_window_set_keep_above(GTK_WINDOW(equalizerwin), always);
+    gtk_window_set_keep_above(GTK_WINDOW(playlistwin), always);
+}
+
+void
+hint_set_sticky(gboolean sticky)
+{
+    if (sticky) {
+        gtk_window_stick(GTK_WINDOW(mainwin));
+        gtk_window_stick(GTK_WINDOW(equalizerwin));
+        gtk_window_stick(GTK_WINDOW(playlistwin));
+    }
+    else {
+        gtk_window_unstick(GTK_WINDOW(mainwin));
+        gtk_window_unstick(GTK_WINDOW(equalizerwin));
+        gtk_window_unstick(GTK_WINDOW(playlistwin));
+    }
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/skins/ui_hints.h	Thu May 22 15:15:31 2008 +0200
@@ -0,0 +1,35 @@
+/*  Audacious - Cross-platform multimedia player
+ *  Copyright (C) 2005-2007  Audacious development team
+ *
+ *  Based on BMP:
+ *  Copyright (C) 2003-2004  BMP development team.
+ *
+ *  Based on XMMS:
+ *  Copyright (C) 1998-2003  XMMS development team.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; under version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses>.
+ *
+ *  The Audacious team does not consider modular code linking to
+ *  Audacious or using our public API to be a derived work.
+ */
+
+#ifndef AUDACIOUS_UI_HINTS_H
+#define AUDACIOUS_UI_HINTS_H
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+void hint_set_always(gboolean always);
+void hint_set_sticky(gboolean sticky);
+
+#endif /* AUDACIOUS_UI_HINTS_H */
--- a/src/skins/ui_main.c	Thu May 22 15:10:00 2008 +0200
+++ b/src/skins/ui_main.c	Thu May 22 15:15:31 2008 +0200
@@ -55,6 +55,7 @@
 #include "ui_manager.h"
 #include "ui_equalizer.h"
 #include "ui_playlist.h"
+#include "ui_hints.h"
 #if 0
 #include "configdb.h"
 #include "dnd.h"
@@ -67,7 +68,6 @@
 #include "ui_credits.h"
 #include "ui_dock.h"
 #include "ui_fileinfo.h"
-#include "ui_hints.h"
 #include "ui_jumptotrack.h"
 #include "ui_main_evlisteners.h"
 #include "ui_preferences.h"
@@ -2638,9 +2638,7 @@
     UI_SKINNED_MENUROW(mainwin_menurow)->always_selected = gtk_toggle_action_get_active( action );
     config.always_on_top = UI_SKINNED_MENUROW(mainwin_menurow)->always_selected;
     gtk_widget_queue_draw(mainwin_menurow);
-#if 0
     hint_set_always(config.always_on_top);
-#endif
 }
 
 void
@@ -2661,10 +2659,8 @@
 void
 action_view_on_all_workspaces( GtkToggleAction * action )
 {
-#if 0
     config.sticky = gtk_toggle_action_get_active( action );
     hint_set_sticky(config.sticky);
-#endif
 }
 
 void
@@ -2682,9 +2678,7 @@
 void
 action_roll_up_playlist_editor( GtkToggleAction * action )
 {
-#if 0
     playlistwin_set_shade(gtk_toggle_action_get_active(action));
-#endif
 }
 
 void
@@ -2699,12 +2693,10 @@
 void
 action_show_playlist_editor( GtkToggleAction * action )
 {
-#if 0
     if (gtk_toggle_action_get_active(action))
         playlistwin_show();
     else
         playlistwin_hide();
-#endif
 }
 
 void