Mercurial > audlegacy

changeset 4664:46c02b5589c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commited initial version of new UI, which can be tested via "audacious -H"
author mf0102 <0102@gmx.at>
date Sun, 29 Jun 2008 01:27:24 +0200
parents 413cce2453b2
children d8a07aa54bef
files src/audacious/Makefile src/audacious/main.c src/audacious/ui_new.c src/audacious/ui_new.h
diffstat 4 files changed, 182 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/Makefile	Sun Jun 29 00:41:11 2008 +0300
+++ b/src/audacious/Makefile	Sun Jun 29 01:27:24 2008 +0200
@@ -51,6 +51,7 @@
        ui_main.c						\
        ui_main_evlisteners.c			\
        ui_manager.c						\
+       ui_new.c							\
        ui_playlist.c					\
        ui_playlist_evlisteners.c		\
        ui_playlist_manager.c			\
--- a/src/audacious/main.c	Sun Jun 29 00:41:11 2008 +0300
+++ b/src/audacious/main.c	Sun Jun 29 01:27:24 2008 +0200
@@ -89,6 +89,11 @@
 #include "icons-stock.h"
 #include "images/audacious_player.xpm"
 
+
+#include "ui_new.h"
+
+
+
 static const gchar *application_name = N_("Audacious");
 
 struct _AudCmdLineOpt {
@@ -818,11 +823,17 @@
     // if we are running headless
     else
     {
+        /* temporarily headless operation is disabled in favour of
+         * testing the new UI */
+        ui_initialize();
+
+#if 0
         g_print(_("Headless operation enabled\n"));
         resume_playback_on_startup();
 
         g_timeout_add(10, aud_headless_iteration, NULL);
         g_main_loop_run(g_main_loop_new(NULL, TRUE));
+#endif
     }
 
     aud_quit();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/audacious/ui_new.c	Sun Jun 29 01:27:24 2008 +0200
@@ -0,0 +1,145 @@
+/*  Audacious - Cross-platform multimedia player
+ *  Copyright (C) 2005-2008  Audacious 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 <gtk/gtk.h>
+
+#include "playlist.h"
+#include "ui_fileopener.h"
+
+static GtkWidget *label_prev, *label_current, *label_next;
+
+gboolean
+window_delete()
+{
+    return FALSE;
+}
+
+void
+window_destroy(GtkWidget *widget, gpointer data)
+{
+    gtk_main_quit();
+}
+
+void
+button_open_pressed()
+{
+    run_filebrowser(TRUE);
+}
+
+void
+button_previous_pressed()
+{
+    playlist_prev(playlist_get_active());
+}
+
+void
+button_next_pressed()
+{
+    playlist_next(playlist_get_active());
+}
+
+void
+set_song_title(gpointer hook_data, gpointer user_data)
+{
+    gchar *title =
+        g_strdup_printf("<big>%s</big>",
+                        playlist_get_info_text(playlist_get_active()));
+    gtk_label_set_text(GTK_LABEL(label_current), title);
+    g_object_set(G_OBJECT(label_current), "use-markup", TRUE, NULL);
+    g_free(title);
+}
+
+
+GtkWidget *
+gtk_box_button_add(GtkWidget *box, void(*callback)(), const gchar *stock_id)
+{
+    GtkWidget *button = gtk_button_new_from_stock(stock_id);
+    gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
+    g_signal_connect(G_OBJECT(button), "button-press-event",
+                     G_CALLBACK(callback), NULL);
+    return button;
+}
+
+GtkWidget *
+gtk_markup_label_new(const gchar *str)
+{
+    GtkWidget *label = gtk_label_new(str);
+    g_object_set(G_OBJECT(label), "use-markup", TRUE, NULL);
+    return label;
+}
+
+void
+ui_initialize()
+{
+    GtkWidget *window;		/* the main window */
+    GtkWidget *vbox;		/* the main vertical box */
+    GtkWidget *buttonbox;	/* box containing buttons like "open", "next" */
+    GtkWidget *pcnbox;		/* box containing information about previous,
+                               current and next track */
+
+    GtkWidget *chbox;	/* box containing album art and information
+                           about current track */
+    GtkWidget *cvbox;	/* box containing information about current track
+                           and some control elements like position bar */
+
+    GtkWidget *button_open, *button_previous, *button_next;
+
+
+    window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    g_signal_connect(G_OBJECT(window), "delete_event",
+                     G_CALLBACK(window_delete), NULL);
+    g_signal_connect(G_OBJECT(window), "destroy",
+                     G_CALLBACK(window_destroy), NULL);
+
+
+    vbox = gtk_vbox_new(FALSE, 0);
+    gtk_container_add(GTK_CONTAINER(window), vbox);
+
+
+    buttonbox = gtk_hbox_new(FALSE, 0);
+    button_open = gtk_box_button_add(buttonbox, button_open_pressed,
+                                     GTK_STOCK_OPEN);
+    button_previous = gtk_box_button_add(buttonbox, button_previous_pressed,
+                                         GTK_STOCK_MEDIA_PREVIOUS);
+    button_next = gtk_box_button_add(buttonbox, button_next_pressed,
+                                     GTK_STOCK_MEDIA_NEXT);
+    gtk_box_pack_start(GTK_BOX(vbox), buttonbox, TRUE, TRUE, 0);
+
+
+    pcnbox = gtk_vbox_new(FALSE, 0);
+
+    chbox = gtk_hbox_new(FALSE, 0);
+    cvbox = gtk_vbox_new(FALSE, 0);
+    label_current = gtk_markup_label_new("<big>Current: ?</big>");
+    gtk_box_pack_start(GTK_BOX(cvbox), label_current, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(chbox), cvbox, TRUE, TRUE, 0);
+
+    label_prev = gtk_markup_label_new("<small>Previous: ?</small>");
+    label_next = gtk_markup_label_new("<small>Next: ?</small>");
+    gtk_box_pack_start(GTK_BOX(pcnbox), label_prev, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(pcnbox), chbox, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(pcnbox), label_next, TRUE, TRUE, 0);
+
+    gtk_box_pack_start(GTK_BOX(vbox), pcnbox, TRUE, TRUE, 0);
+
+    hook_associate("title change", set_song_title, NULL);
+
+    gtk_widget_show_all(window);
+    gtk_main();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/audacious/ui_new.h	Sun Jun 29 01:27:24 2008 +0200
@@ -0,0 +1,25 @@
+/*  Audacious - Cross-platform multimedia player
+ *  Copyright (C) 2005-2008  Audacious 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 UI_NEW_H
+#define UI_NEW_H
+
+void ui_initialize();
+
+#endif