chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rearrange crazy control.c logic. No longer are there two widgets per
[disorder]
/
disobedience
/
disobedience.h
diff --git
a/disobedience/disobedience.h
b/disobedience/disobedience.h
index 0e16474e5d0105eea62543723f60e137f1e068b3..452526d9fd8f26ca818070dcc70e227db7d4bdd2 100644
(file)
--- a/
disobedience/disobedience.h
+++ b/
disobedience/disobedience.h
@@
-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,8
@@
#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 <glib.h>
#include <gtk/gtk.h>
#include <glib.h>
#include <gtk/gtk.h>
@@
-75,6
+73,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;
};
@@
-97,6
+99,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 --------------------------------------------------------------- */
@@
-119,8
+122,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);
@@
-138,12
+139,14
@@
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, ...);
@@
-157,13
+160,11
@@
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);
-
-void register_monitor(monitor_callback *callback,
- void *u,
- unsigned long mask);
-/* Register a state monitor */
+GtkWidget *create_buttons_box(struct button *buttons,
+ size_t nbuttons,
+ GtkWidget *box);
/** @brief Type signature for a reset callback */
typedef void reset_callback(void);
/** @brief Type signature for a reset callback */
typedef void reset_callback(void);
@@
-185,17
+186,13
@@
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 */
extern int suppress_actions;
/* Queue/Recent/Added */
@@
-206,12
+203,6
@@
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_none(struct queuelike *ql);
/* Select all/none on some queue */
void queue_select_all(struct queuelike *ql);
void queue_select_none(struct queuelike *ql);
/* Select all/none on some queue */
@@
-227,7
+218,6
@@
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 */
-
/* Choose */
GtkWidget *choose_widget(void);
/* Choose */
GtkWidget *choose_widget(void);
@@
-236,10
+226,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);