~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
_eclient_state is more general than _eclient_connected
[disorder]
/
disobedience
/
menu.c
diff --git
a/disobedience/menu.c
b/disobedience/menu.c
index
6eaea06
..
3347a51
100644
(file)
--- a/
disobedience/menu.c
+++ b/
disobedience/menu.c
@@
-61,7
+61,8
@@
void menu_update(int page) {
assert(t != 0);
gtk_widget_set_sensitive(properties_widget,
assert(t != 0);
gtk_widget_set_sensitive(properties_widget,
- t->properties_sensitive(tab));
+ (t->properties_sensitive(tab)
+ && (disorder_eclient_state(client) & DISORDER_CONNECTED)));
gtk_widget_set_sensitive(selectall_widget,
t->selectall_sensitive(tab));
}
gtk_widget_set_sensitive(selectall_widget,
t->selectall_sensitive(tab));
}
@@
-95,7
+96,7
@@
static void about_popup_got_version(void attribute((unused)) *v,
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox),
gtk_label_new(server_version_string));
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox),
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox),
gtk_label_new(server_version_string));
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(w)->vbox),
- gtk_label_new("(c) 2004-200
6
Richard Kettlewell"));
+ gtk_label_new("(c) 2004-200
7
Richard Kettlewell"));
gtk_widget_show_all(w);
gtk_dialog_run(GTK_DIALOG(w));
gtk_widget_destroy(w);
gtk_widget_show_all(w);
gtk_dialog_run(GTK_DIALOG(w));
gtk_widget_destroy(w);
@@
-104,12
+105,12
@@
static void about_popup_got_version(void attribute((unused)) *v,
GtkWidget *menubar(GtkWidget *w) {
static const GtkItemFactoryEntry entries[] = {
{ (char *)"/File", 0, 0, 0, (char *)"<Branch>", 0 },
GtkWidget *menubar(GtkWidget *w) {
static const GtkItemFactoryEntry entries[] = {
{ (char *)"/File", 0, 0, 0, (char *)"<Branch>", 0 },
- { (char *)"/File/Quit", (char *)"<CTRL>Q", quit_program, 0,
+ { (char *)"/File/Quit
Disobedience
", (char *)"<CTRL>Q", quit_program, 0,
(char *)"<StockItem>", GTK_STOCK_QUIT },
{ (char *)"/Edit", 0, 0, 0, (char *)"<Branch>", 0 },
(char *)"<StockItem>", GTK_STOCK_QUIT },
{ (char *)"/Edit", 0, 0, 0, (char *)"<Branch>", 0 },
- { (char *)"/Edit/Select
All
", (char *)"<CTRL>A", select_all, 0,
+ { (char *)"/Edit/Select
all tracks
", (char *)"<CTRL>A", select_all, 0,
0, 0 },
0, 0 },
- { (char *)"/Edit/
P
roperties", 0, properties_item, 0,
+ { (char *)"/Edit/
Track p
roperties", 0, properties_item, 0,
0, 0 },
{ (char *)"/Help", 0, 0, 0, (char *)"<Branch>", 0 },
{ (char *)"/Help/About DisOrder", 0, about_popup, 0,
0, 0 },
{ (char *)"/Help", 0, 0, 0, (char *)"<Branch>", 0 },
{ (char *)"/Help/About DisOrder", 0, about_popup, 0,
@@
-129,9
+130,9
@@
GtkWidget *menubar(GtkWidget *w) {
0);
gtk_window_add_accel_group(GTK_WINDOW(w), accel);
selectall_widget = gtk_item_factory_get_widget(itemfactory,
0);
gtk_window_add_accel_group(GTK_WINDOW(w), accel);
selectall_widget = gtk_item_factory_get_widget(itemfactory,
- "<GdisorderMain>/Edit/Select
All
");
+ "<GdisorderMain>/Edit/Select
all tracks
");
properties_widget = gtk_item_factory_get_widget(itemfactory,
properties_widget = gtk_item_factory_get_widget(itemfactory,
- "<GdisorderMain>/Edit/
P
roperties");
+ "<GdisorderMain>/Edit/
Track p
roperties");
assert(selectall_widget != 0);
assert(properties_widget != 0);
return gtk_item_factory_get_widget(itemfactory,
assert(selectall_widget != 0);
assert(properties_widget != 0);
return gtk_item_factory_get_widget(itemfactory,
@@
-147,4
+148,3
@@
fill-column:79
indent-tabs-mode:nil
End:
*/
indent-tabs-mode:nil
End:
*/
-/* arch-tag:3vGhvsh3YABCyUS65pvmVA */