[Goodies-commits] r1932 - in xfce4-notes-plugin/trunk: . panel-plugin
Mike Massonnet
mmassonnet at xfce.org
Wed Aug 30 04:49:24 CEST 2006
Author: mmassonnet
Date: 2006-08-30 02:49:22 +0000 (Wed, 30 Aug 2006)
New Revision: 1932
Modified:
xfce4-notes-plugin/trunk/ChangeLog
xfce4-notes-plugin/trunk/panel-plugin/notes-options.c
xfce4-notes-plugin/trunk/panel-plugin/notes-window.c
xfce4-notes-plugin/trunk/panel-plugin/notes.c
xfce4-notes-plugin/trunk/panel-plugin/notes.h
Log:
* panel-plugin/notes.{c,h}, panel-plugin/notes-window.c: Changed the
panel toggled button against a classic panel button.
Modified: xfce4-notes-plugin/trunk/ChangeLog
===================================================================
--- xfce4-notes-plugin/trunk/ChangeLog 2006-08-30 02:44:24 UTC (rev 1931)
+++ xfce4-notes-plugin/trunk/ChangeLog 2006-08-30 02:49:22 UTC (rev 1932)
@@ -8,6 +8,8 @@
* panel-plugin/notes.c, panel-plugin/notes-window.c: Clean up
save_on_timeout() and make better use of it (on close a page). Add
save_on_timeout_execute().
+ * panel-plugin/notes.{c,h}, panel-plugin/notes-window.c: Changed the
+ panel toggled button against a classic panel button.
2006-08-14 Mike Massonnet <mmassonnet at gmail.com>
Modified: xfce4-notes-plugin/trunk/panel-plugin/notes-options.c
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/notes-options.c 2006-08-30 02:44:24 UTC (rev 1931)
+++ xfce4-notes-plugin/trunk/panel-plugin/notes-options.c 2006-08-30 02:49:22 UTC (rev 1932)
@@ -112,22 +112,22 @@
}
static void
-on_toggle_show (GtkWidget *widget, NotesPlugin *notes)
+on_toggle_show (GtkWidget *checkbox, NotesPlugin *notes)
{
gboolean toggle_value;
- g_object_get (G_OBJECT (widget), "active", &toggle_value, NULL);
+ g_object_get (G_OBJECT (checkbox), "active", &toggle_value, NULL);
notes->options.show = toggle_value;
DBG ("Set option show: %d", toggle_value);
}
static void
-on_toggle_task_switcher (GtkWidget *widget, NotesPlugin *notes)
+on_toggle_task_switcher (GtkWidget *checkbox, NotesPlugin *notes)
{
gboolean toggle_value;
- g_object_get (G_OBJECT (widget), "active", &toggle_value, NULL);
+ g_object_get (G_OBJECT (checkbox), "active", &toggle_value, NULL);
notes->options.task_switcher = toggle_value;
gtk_window_set_skip_pager_hint (GTK_WINDOW (notes->note->window),
@@ -139,11 +139,11 @@
}
static void
-on_toggle_always_on_top (GtkWidget *widget, NotesPlugin *notes)
+on_toggle_always_on_top (GtkWidget *checkbox, NotesPlugin *notes)
{
gboolean toggle_value;
- g_object_get (G_OBJECT (widget), "active", &toggle_value, NULL);
+ g_object_get (G_OBJECT (checkbox), "active", &toggle_value, NULL);
notes->options.always_on_top = toggle_value;
gtk_window_set_keep_above (GTK_WINDOW (notes->note->window), toggle_value);
@@ -152,11 +152,11 @@
}
static void
-on_toggle_stick (GtkWidget *widget, NotesPlugin *notes)
+on_toggle_stick (GtkWidget *checkbox, NotesPlugin *notes)
{
gboolean toggle_value;
- g_object_get (G_OBJECT (widget), "active", &toggle_value, NULL);
+ g_object_get (G_OBJECT (checkbox), "active", &toggle_value, NULL);
notes->options.stick = toggle_value;
if (toggle_value)
Modified: xfce4-notes-plugin/trunk/panel-plugin/notes-window.c
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/notes-window.c 2006-08-30 02:44:24 UTC (rev 1931)
+++ xfce4-notes-plugin/trunk/panel-plugin/notes-window.c 2006-08-30 02:49:22 UTC (rev 1932)
@@ -35,7 +35,6 @@
static void note_page_load_data (XfcePanelPlugin *, NotePage *);
static gboolean on_note_delete ();
-static void on_note_close (GtkWidget *, GtkToggleButton *);
static gboolean on_title_press (GtkWidget *, GdkEventButton *, GtkWindow *);
static gboolean on_title_scroll (GtkWidget *, GdkEventScroll *, Note *);
static gboolean on_note_key_press (GtkWidget *, GdkEventKey *, NotesPlugin *);
@@ -178,8 +177,8 @@
gtk_container_add (GTK_CONTAINER (note->close), image_close);
- g_signal_connect (note->close, "clicked", G_CALLBACK (on_note_close),
- notes->button);
+ g_signal_connect (note->close, "button-press-event",
+ G_CALLBACK (notes_button_pressed), notes);
/* Notebook */
@@ -305,12 +304,6 @@
return TRUE;
}
-static void
-on_note_close (GtkWidget *widget, GtkToggleButton *panel_button)
-{
- gtk_toggle_button_set_active (panel_button, FALSE);
-}
-
static gboolean
on_title_press (GtkWidget *widget, GdkEventButton *event, GtkWindow *window)
{
@@ -355,7 +348,7 @@
if (event->type == GDK_KEY_PRESS)
{
if (event->keyval == GDK_Escape)
- on_note_close (widget, GTK_TOGGLE_BUTTON (notes->button));
+ notes_button_pressed (notes->plugin, NULL, notes);
else if (event->state & GDK_CONTROL_MASK)
{
if (event->keyval == GDK_Page_Down)
Modified: xfce4-notes-plugin/trunk/panel-plugin/notes.c
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/notes.c 2006-08-30 02:44:24 UTC (rev 1931)
+++ xfce4-notes-plugin/trunk/panel-plugin/notes.c 2006-08-30 02:49:22 UTC (rev 1932)
@@ -43,7 +43,6 @@
static void notes_configure (XfcePanelPlugin *, NotesPlugin *);
static gboolean notes_set_size (XfcePanelPlugin *, int size, NotesPlugin *);
static void notes_load_data (XfcePanelPlugin *, NotesPlugin *);
-static void notes_button_toggled (XfcePanelPlugin *, NotesPlugin *);
static void on_options_response (GtkWidget *, int response, NotesPlugin *);
@@ -229,8 +228,8 @@
g_signal_connect (plugin, "free-data",
G_CALLBACK (notes_free_data), notes);
- g_signal_connect (notes->button, "toggled",
- G_CALLBACK (notes_button_toggled), notes);
+ g_signal_connect (notes->button, "button-press-event",
+ G_CALLBACK (notes_button_pressed), notes);
g_signal_connect (plugin, "save",
G_CALLBACK (notes_save), notes);
@@ -243,7 +242,7 @@
G_CALLBACK (notes_configure), notes);
if (notes->options.show)
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (notes->button), TRUE);
+ gtk_button_pressed (GTK_BUTTON (notes->button));
}
NotesPlugin *
@@ -258,7 +257,7 @@
notes->plugin = plugin;
notes->timeout_id = 0;
- notes->button = xfce_create_panel_toggle_button ();
+ notes->button = xfce_create_panel_button ();
gtk_widget_show (notes->button);
notes->icon = gtk_image_new ();
@@ -322,13 +321,14 @@
}
}
-static void
-notes_button_toggled (XfcePanelPlugin *plugin, NotesPlugin *notes)
+gboolean
+notes_button_pressed (XfcePanelPlugin *plugin, GdkEventButton *event,
+ NotesPlugin *notes)
{
- DBG ("Notes Button Toggled");
+ DBG ("Notes Button Pressed");
/* Show/hide the note */
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (notes->button)))
+ if (!GTK_WIDGET_VISIBLE (notes->note->window))
{
if (notes->note->x != -1 && notes->note->y != -1)
gtk_window_move (GTK_WINDOW (notes->note->window), notes->note->x,
@@ -359,6 +359,8 @@
gtk_widget_hide (notes->note->window);
}
+
+ return FALSE;
}
static void
Modified: xfce4-notes-plugin/trunk/panel-plugin/notes.h
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/notes.h 2006-08-30 02:44:24 UTC (rev 1931)
+++ xfce4-notes-plugin/trunk/panel-plugin/notes.h 2006-08-30 02:49:22 UTC (rev 1932)
@@ -51,6 +51,8 @@
NotesPlugin * notes_new (XfcePanelPlugin *);
Note * note_new (NotesPlugin *);
void note_page_new (XfcePanelPlugin *, NotesPlugin *);
+gboolean notes_button_pressed (XfcePanelPlugin *, GdkEventButton *,
+ NotesPlugin *);
void save_on_timeout (NotesPlugin *);
#endif
More information about the Goodies-commits
mailing list