chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Leave a comment about iffy icon sensivity; it's definitely setting the
[disorder]
/
disobedience
/
disobedience.h
diff --git
a/disobedience/disobedience.h
b/disobedience/disobedience.h
index dbc6882e039c4141b073673cff3eb70017800cdf..2beb032baecd638397e2ebe0d1daea8decbf3aed 100644
(file)
--- a/
disobedience/disobedience.h
+++ b/
disobedience/disobedience.h
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2006
, 2007
Richard Kettlewell
+ * Copyright (C) 2006
-2008
Richard Kettlewell
*
* 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
*
* 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
@@
-24,13
+24,9
@@
#ifndef DISOBEDIENCE_H
#define DISOBEDIENCE_H
#ifndef DISOBEDIENCE_H
#define DISOBEDIENCE_H
-#include <config.h>
-#include "types.h"
+#include "common.h"
-#include <stdio.h>
#include <time.h>
#include <time.h>
-#include <string.h>
-#include <assert.h>
#include <ctype.h>
#include <errno.h>
#include <math.h>
#include <ctype.h>
#include <errno.h>
#include <math.h>
@@
-49,6
+45,9
@@
#include "configuration.h"
#include "hash.h"
#include "selection.h"
#include "configuration.h"
#include "hash.h"
#include "selection.h"
+#include "kvp.h"
+#include "eventdist.h"
+#include "split.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <glib.h>
#include <gtk/gtk.h>
@@
-75,6
+74,10
@@
struct callbackdata {
struct choosenode *choosenode; /* gtkchoose.c got_files/got_dirs */
struct queuelike *ql; /* gtkqueue.c queuelike_completed */
struct prefdata *f; /* properties.c */
struct choosenode *choosenode; /* gtkchoose.c got_files/got_dirs */
struct queuelike *ql; /* gtkqueue.c queuelike_completed */
struct prefdata *f; /* properties.c */
+ const char *user; /* users.c */
+ struct {
+ const char *user, *email; /* users.c */
+ } edituser;
} u;
};
} u;
};
@@
-84,10
+87,14
@@
struct callbackdata {
* have some callbacks to set them appropriately.
*/
struct tabtype {
* have some callbacks to set them appropriately.
*/
struct tabtype {
- int (*properties_sensitive)(GtkWidget *tab);
- int (*selectall_sensitive)(GtkWidget *tab);
- void (*properties_activate)(GtkWidget *tab);
- void (*selectall_activate)(GtkWidget *tab);
+ int (*properties_sensitive)(void *extra);
+ int (*selectall_sensitive)(void *extra);
+ int (*selectnone_sensitive)(void *extra);
+ void (*properties_activate)(void *extra);
+ void (*selectall_activate)(void *extra);
+ void (*selectnone_activate)(void *extra);
+ void (*selected)(void);
+ void *extra;
};
/** @brief Button definitions */
};
/** @brief Button definitions */
@@
-95,6
+102,7
@@
struct button {
const gchar *stock;
void (*clicked)(GtkButton *button, gpointer userdata);
const char *tip;
const gchar *stock;
void (*clicked)(GtkButton *button, gpointer userdata);
const char *tip;
+ GtkWidget *widget;
};
/* Variables --------------------------------------------------------------- */
};
/* Variables --------------------------------------------------------------- */
@@
-106,6
+114,7
@@
extern GtkWidget *tabs; /* main tabs */
extern disorder_eclient *client; /* main client */
extern unsigned long last_state; /* last reported state */
extern disorder_eclient *client; /* main client */
extern unsigned long last_state; /* last reported state */
+extern rights_type last_rights; /* last reported rights bitmap */
extern int playing; /* true if playing some track */
extern int volume_l, volume_r; /* current volume */
extern double goesupto; /* volume upper bound */
extern int playing; /* true if playing some track */
extern int volume_l, volume_r; /* current volume */
extern double goesupto; /* volume upper bound */
@@
-117,8
+126,6
@@
extern GtkItemFactory *mainmenufactory;
extern const disorder_eclient_log_callbacks log_callbacks;
extern const disorder_eclient_log_callbacks log_callbacks;
-typedef void monitor_callback(void *u);
-
/* Functions --------------------------------------------------------------- */
disorder_eclient *gtkclient(void);
/* Functions --------------------------------------------------------------- */
disorder_eclient *gtkclient(void);
@@
-131,17
+138,17
@@
void popup_protocol_error(int code,
void properties(int ntracks, const char **tracks);
/* Pop up a properties window for a list of tracks */
void properties(int ntracks, const char **tracks);
/* Pop up a properties window for a list of tracks */
-void properties_reset(void);
-
GtkWidget *scroll_widget(GtkWidget *child);
/* Wrap a widget up for scrolling */
GtkWidget *scroll_widget(GtkWidget *child);
/* Wrap a widget up for scrolling */
+GtkWidget *frame_widget(GtkWidget *w, const char *title);
+
GdkPixbuf *find_image(const char *name);
/* Get the pixbuf for an image. Returns a null pointer if it cannot be
* found. */
void popup_msg(GtkMessageType mt, const char *msg);
GdkPixbuf *find_image(const char *name);
/* Get the pixbuf for an image. Returns a null pointer if it cannot be
* found. */
void popup_msg(GtkMessageType mt, const char *msg);
-/* Pop up a message */
+void popup_submsg(GtkWidget *parent, GtkMessageType mt, const char *msg);
void fpopup_msg(GtkMessageType mt, const char *fmt, ...);
void fpopup_msg(GtkMessageType mt, const char *fmt, ...);
@@
-155,21
+162,13
@@
void progress_window_progress(struct progress_window *pw,
GtkWidget *iconbutton(const char *path, const char *tip);
GtkWidget *iconbutton(const char *path, const char *tip);
-GtkWidget *create_buttons(
const
struct button *buttons,
+GtkWidget *create_buttons(struct button *buttons,
size_t nbuttons);
size_t nbuttons);
+GtkWidget *create_buttons_box(struct button *buttons,
+ size_t nbuttons,
+ GtkWidget *box);
-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 logged_in(void);
void all_update(void);
/* Update everything */
void all_update(void);
/* Update everything */
@@
-183,16
+182,14
@@
void menu_update(int page);
/* Called whenever the main menu might need to change. PAGE is the current
* page if known or -1 otherwise. */
/* Called whenever the main menu might need to change. PAGE is the current
* page if known or -1 otherwise. */
+void users_set_sensitive(int sensitive);
/* Controls */
GtkWidget *control_widget(void);
/* Make the controls widget */
/* Controls */
GtkWidget *control_widget(void);
/* Make the controls widget */
-void volume_update(void);
-/* Called whenever we think the volume control has changed */
-
-void control_monitor(void *u);
+extern int suppress_actions;
/* Queue/Recent/Added */
/* Queue/Recent/Added */
@@
-202,14
+199,9
@@
GtkWidget *added_widget(void);
/* Create widgets for displaying the queue, the recently played list and the
* newly added tracks list */
/* Create widgets for displaying the queue, the recently played list and the
* newly added tracks list */
-void queue_update(void);
-void recent_update(void);
-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);
void queue_select_all(struct queuelike *ql);
-/* Select all on some queue */
+void queue_select_none(struct queuelike *ql);
+/* Select all/none on some queue */
void queue_properties(struct queuelike *ql);
/* Pop up properties of selected items in some queue */
void queue_properties(struct queuelike *ql);
/* Pop up properties of selected items in some queue */
@@
-222,6
+214,7
@@
void namepart_update(const char *track,
const char *part);
/* Called when a namepart might have changed */
const char *part);
/* Called when a namepart might have changed */
+extern struct queue_entry *playing_track;
/* Choose */
/* Choose */
@@
-231,10
+224,19
@@
GtkWidget *choose_widget(void);
void choose_update(void);
/* Called when we think the choose tree might need updating */
void choose_update(void);
/* Called when we think the choose tree might need updating */
+void play_completed(void *v,
+ const char *error);
+
/* Login details */
void login_box(void);
/* Login details */
void login_box(void);
+GtkWidget *login_window;
+
+/* User management */
+
+void manage_users(void);
+
/* Help */
void popup_help(void);
/* Help */
void popup_help(void);
@@
-245,16
+247,24
@@
int rtp_running(void);
void start_rtp(void);
void stop_rtp(void);
void start_rtp(void);
void stop_rtp(void);
-/* Appearance */
+/* Settings */
+
+void init_styles(void);
+extern GtkStyle *layout_style;
+extern GtkStyle *title_style;
+extern GtkStyle *even_style;
+extern GtkStyle *odd_style;
+extern GtkStyle *active_style;
+extern GtkStyle *tool_style;
+extern GtkStyle *search_style;
+extern GtkStyle *drag_style;
-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;
+extern const char *browser;
-void save_
appearance
(void);
-void load_
appearance
(void);
+void save_
settings
(void);
+void load_
settings
(void);
void set_tool_colors(GtkWidget *w);
void set_tool_colors(GtkWidget *w);
-void
set_slider_colors(GtkWidget *w
);
+void
popup_settings(void
);
/* Widget leakage debugging rubbish ---------------------------------------- */
/* Widget leakage debugging rubbish ---------------------------------------- */