* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
GdkWindow *child,
gint level)
{
- static const GdkRGBA colors[] = {
+ static GdkRGBA colors[] = {
{ 0.27, 0.27, 1.0, 1.0 },
{ 0.53, 0.53, 1.0, 1.0},
{ 0.67, 0.67, 1.0, 1.0 }
{
if (event->type == GDK_BUTTON_PRESS)
{
- if (event->button == 1)
+ if (event->button == GDK_BUTTON_PRIMARY)
gtk_window_begin_resize_drag (GTK_WINDOW (gtk_widget_get_toplevel (area)), edge,
event->button, event->x_root, event->y_root,
event->time);
- else if (event->button == 2)
+ else if (event->button == GDK_BUTTON_MIDDLE)
gtk_window_begin_move_drag (GTK_WINDOW (gtk_widget_get_toplevel (area)),
event->button, event->x_root, event->y_root,
event->time);
cmw_color (GtkWidget *widget, GtkWidget *parent)
{
GtkWidget *csd;
- GtkWidget *colorsel;
- GtkWidget *ok_button, *cancel_button;
- csd = gtk_color_selection_dialog_new ("This is a modal color selection dialog");
+ csd = gtk_color_chooser_dialog_new ("This is a modal color selection dialog", GTK_WINDOW (parent));
- gtk_window_set_screen (GTK_WINDOW (csd), gtk_widget_get_screen (parent));
-
- colorsel = gtk_color_selection_dialog_get_color_selection (GTK_COLOR_SELECTION_DIALOG (csd));
- gtk_color_selection_set_has_palette (GTK_COLOR_SELECTION (colorsel),
- TRUE);
-
/* Set as modal */
gtk_window_set_modal (GTK_WINDOW(csd),TRUE);
- /* And mark it as a transient dialog */
- gtk_window_set_transient_for (GTK_WINDOW (csd), GTK_WINDOW (parent));
-
g_signal_connect (csd, "destroy",
G_CALLBACK (cmw_destroy_cb), NULL);
-
- g_object_get (csd,
- "ok-button", &ok_button,
- "cancel-button", &cancel_button,
- NULL);
-
- g_signal_connect_swapped (ok_button,
- "clicked", G_CALLBACK (gtk_widget_destroy), csd);
- g_signal_connect_swapped (cancel_button,
- "clicked", G_CALLBACK (gtk_widget_destroy), csd);
+ g_signal_connect (csd, "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
/* wait until destroy calls gtk_main_quit */
gtk_widget_show (csd);
gtk_entry_set_progress_fraction (GTK_ENTRY (data), fraction);
}
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
static void
GtkSpinButton *spinner)
{
if ((event->type == GDK_BUTTON_PRESS) &&
- ((event->button.button == 1) ||
- (event->button.button == 3)))
+ ((event->button.button == GDK_BUTTON_PRIMARY) ||
+ (event->button.button == GDK_BUTTON_SECONDARY)))
{
- gtk_spin_button_spin (spinner, event->button.button == 1 ?
+ gtk_spin_button_spin (spinner, event->button.button == GDK_BUTTON_PRIMARY ?
GTK_SPIN_STEP_FORWARD : GTK_SPIN_STEP_BACKWARD, 0);
return TRUE;
}
gtk_container_add (GTK_CONTAINER (hbox), label);
picker = gtk_color_button_new ();
- gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (picker), TRUE);
+ gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (picker), TRUE);
gtk_container_add (GTK_CONTAINER (hbox), picker);
button = gtk_button_new_with_mnemonic ("_Props");
gtk_widget_destroy (window);
}
+void
+create_settings (GtkWidget *widget)
+{
+ static GtkWidget *window = NULL;
+
+ if (!window)
+ {
+ window = create_prop_editor (G_OBJECT (gtk_settings_get_default ()), GTK_TYPE_SETTINGS);
+ gtk_window_set_screen (GTK_WINDOW (window),
+ gtk_widget_get_screen (widget));
+
+ gtk_widget_hide (window);
+ gtk_window_set_title (GTK_WINDOW (window), "GTK+ Settings");
+
+ g_signal_connect (window, "destroy",
+ G_CALLBACK (gtk_widget_destroyed),
+ &window);
+ }
+
+ if (!gtk_widget_get_visible (window))
+ gtk_widget_show (window);
+ else
+ gtk_widget_destroy (window);
+}
+
/*
* GtkPanes
*/
GtkWidget *frame;
GtkWidget *grid;
GtkWidget *label;
- GtkWidget *align;
static ProgressData *pdata = NULL;
static gchar *items1[] =
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add (GTK_CONTAINER (frame), vbox2);
- align = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE, 5);
-
pdata->pbar = gtk_progress_bar_new ();
gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (pdata->pbar),
PANGO_ELLIPSIZE_MIDDLE);
-
- gtk_container_add (GTK_CONTAINER (align), pdata->pbar);
-
- align = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE, 5);
+ gtk_widget_set_halign (pdata->pbar, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (pdata->pbar, GTK_ALIGN_CENTER);
+ gtk_box_pack_start (GTK_BOX (vbox2), pdata->pbar, FALSE, FALSE, 5);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_add (GTK_CONTAINER (align), hbox);
+ gtk_widget_set_halign (hbox, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (hbox, GTK_ALIGN_CENTER);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 5);
label = gtk_label_new ("Label updated by user :");
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
pdata->label = gtk_label_new ("");
sprintf (buffer, "count: %d", ++count);
gtk_label_set_text (GTK_LABEL (label), buffer);
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
static void
{ "rotated text", create_rotated_text },
{ "saved position", create_saved_position },
{ "scrolled windows", create_scrolled_windows },
+ { "settings", create_settings },
{ "shapes", create_shapes },
{ "size groups", create_size_groups },
{ "snapshot", create_snapshot },