remove redundant color

[disorder] / disobedience / disobedience.h

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 09e8daf7f18d694c5012ebf38159643b8c7702ef..dbc6882e039c4141b073673cff3eb70017800cdf 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -58,6 +58,7 @@
 
 struct queuelike;
 struct choosenode;
+struct progress_window;
 
 /** @brief Callback data structure
  *
@@ -89,6 +90,13 @@ struct tabtype {
   void (*selectall_activate)(GtkWidget *tab);
 };
 
+/** @brief Button definitions */
+struct button {
+  const gchar *stock;
+  void (*clicked)(GtkButton *button, gpointer userdata);
+  const char *tip;
+};
+
 /* Variables --------------------------------------------------------------- */
 
 extern GMainLoop *mainloop;
@@ -103,6 +111,9 @@ extern int volume_l, volume_r;          /* current volume */
 extern double goesupto;                 /* volume upper bound */
 extern int choosealpha;                 /* break up choose by letter */
 extern GtkTooltips *tips;
+extern int rtp_supported;
+extern int rtp_is_running;
+extern GtkItemFactory *mainmenufactory;
 
 extern const disorder_eclient_log_callbacks log_callbacks;
 
@@ -117,24 +128,49 @@ void popup_protocol_error(int code,
                           const char *msg);
 /* Report an error */
 
-void properties(int ntracks, char **tracks);
+void properties(int ntracks, const char **tracks);
 /* Pop up a properties window for a list of tracks */
 
-GtkWidget *scroll_widget(GtkWidget *child, const char *name);
+void properties_reset(void);
+
+GtkWidget *scroll_widget(GtkWidget *child);
 /* Wrap a widget up for scrolling */
 
 GdkPixbuf *find_image(const char *name);
 /* Get the pixbuf for an image.  Returns a null pointer if it cannot be
  * found. */
 
-void popup_error(const char *msg);
-/* Pop up an error message */
+void popup_msg(GtkMessageType mt, const char *msg);
+/* Pop up a message */
+
+void fpopup_msg(GtkMessageType mt, const char *fmt, ...);
+
+struct progress_window *progress_window_new(const char *title);
+/* Pop up a progress window */
+
+void progress_window_progress(struct progress_window *pw,
+                             int progress,
+                             int limit);
+/* Report current progress */
+
+GtkWidget *iconbutton(const char *path, const char *tip);
+
+GtkWidget *create_buttons(const struct button *buttons,
+                          size_t nbuttons);
 
 void register_monitor(monitor_callback *callback,
                       void *u,
                       unsigned long mask);
 /* Register a state monitor */
 
+/** @brief Type signature for a reset callback */
+typedef void reset_callback(void);
+
+void register_reset(reset_callback *callback);
+/* Register a reset callback */
+
+void reset(void);
+
 void all_update(void);
 /* Update everything */
 
@@ -156,15 +192,21 @@ GtkWidget *control_widget(void);
 void volume_update(void);
 /* Called whenever we think the volume control has changed */
 
-/* Queue/Recent */
+void control_monitor(void *u);
+
+/* Queue/Recent/Added */
 
 GtkWidget *queue_widget(void);
 GtkWidget *recent_widget(void);
-/* Create widgets for displaying the queue and the recently played list */
+GtkWidget *added_widget(void);
+/* Create widgets for displaying the queue, the recently played list and the
+ * newly added tracks list */
 
 void queue_update(void);
 void recent_update(void);
-/* Called whenever we think the queue or recent list might have chanegd */
+void added_update(void);
+/* Called whenever we think the queue, recent or newly-added list might have
+ * changed */
 
 void queue_select_all(struct queuelike *ql);
 /* Select all on some queue */
@@ -189,6 +231,31 @@ GtkWidget *choose_widget(void);
 void choose_update(void);
 /* Called when we think the choose tree might need updating */
 
+/* Login details */
+
+void login_box(void);
+
+/* Help */
+
+void popup_help(void);
+
+/* RTP */
+
+int rtp_running(void);
+void start_rtp(void);
+void stop_rtp(void);
+
+/* Appearance */
+
+extern GdkColor tool_bg, tool_fg, layout_bg, even_bg, odd_bg;
+extern GdkColor active_bg, selected_bg, selected_fg, search_bg;
+extern GdkColor title_bg, title_fg, item_fg, drag_target, tool_active;
+
+void save_appearance(void);
+void load_appearance(void);
+void set_tool_colors(GtkWidget *w);
+void set_slider_colors(GtkWidget *w);
+
 /* Widget leakage debugging rubbish ---------------------------------------- */
 
 #if MDEBUG