* Library General Public License for more details.
*
* You should have received a copy of the GNU Library 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/>.
*/
-#undef GTK_DISABLE_DEPRECATED
#include "config.h"
#include <gtk/gtk.h>
#include "prop-editor.h"
-static void
-reload_clicked (GtkWidget *widget)
-{
- static GdkAtom atom_rcfiles = GDK_NONE;
-
- GdkEventClient sev;
- int i;
-
- if (!atom_rcfiles)
- atom_rcfiles = gdk_atom_intern("_GTK_READ_RCFILES", FALSE);
-
- for(i = 0; i < 5; i++)
- sev.data.l[i] = 0;
- sev.data_format = 32;
- sev.message_type = atom_rcfiles;
- gdk_event_send_clientmessage_toall ((GdkEvent *) &sev);
-}
-
static void
change_orientation (GtkWidget *button, GtkWidget *toolbar)
{
- GtkWidget *table;
+ GtkWidget *grid;
GtkOrientation orientation;
- table = gtk_widget_get_parent (toolbar);
+ grid = gtk_widget_get_parent (toolbar);
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
orientation = GTK_ORIENTATION_VERTICAL;
else
orientation = GTK_ORIENTATION_HORIZONTAL;
g_object_ref (toolbar);
- gtk_container_remove (GTK_CONTAINER (table), toolbar);
- gtk_toolbar_set_orientation (GTK_TOOLBAR (toolbar), orientation);
+ gtk_container_remove (GTK_CONTAINER (grid), toolbar);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (toolbar), orientation);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
- gtk_table_attach (GTK_TABLE (table), toolbar,
- 0,2, 0,1, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_widget_set_hexpand (toolbar, TRUE);
+ gtk_widget_set_vexpand (toolbar, FALSE);
+ gtk_grid_attach (GTK_GRID (grid), toolbar, 0, 0, 2, 1);
}
else
{
- gtk_table_attach (GTK_TABLE (table), toolbar,
- 0,1, 0,4, GTK_FILL, GTK_FILL|GTK_EXPAND, 0, 0);
+ gtk_widget_set_hexpand (toolbar, FALSE);
+ gtk_widget_set_vexpand (toolbar, TRUE);
+ gtk_grid_attach (GTK_GRID (grid), toolbar, 0, 0, 1, 5);
}
g_object_unref (toolbar);
}
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
{
- style = gtk_option_menu_get_history (GTK_OPTION_MENU (option_menu));
+ style = gtk_combo_box_get_active (GTK_COMBO_BOX (option_menu));
gtk_toolbar_set_style (toolbar, style);
gtk_widget_set_sensitive (option_menu, TRUE);
{
GtkToolbarStyle style;
- style = gtk_option_menu_get_history (GTK_OPTION_MENU (option_menu));
+ style = gtk_combo_box_get_active (GTK_COMBO_BOX (option_menu));
gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), style);
}
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
{
- icon_size = gtk_option_menu_get_history (GTK_OPTION_MENU (option_menu));
- icon_size += GTK_ICON_SIZE_SMALL_TOOLBAR;
+ if (gtk_combo_box_get_active (GTK_COMBO_BOX (option_menu)) == 0)
+ icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR;
+ else
+ icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR;
gtk_toolbar_set_icon_size (toolbar, icon_size);
gtk_widget_set_sensitive (option_menu, TRUE);
}
static void
-icon_size_history_changed (GtkOptionMenu *menu, GtkToolbar *toolbar)
+icon_size_history_changed (GtkComboBox *menu, GtkToolbar *toolbar)
{
int icon_size;
- icon_size = gtk_option_menu_get_history (menu);
- icon_size += GTK_ICON_SIZE_SMALL_TOOLBAR;
+ if (gtk_combo_box_get_active (menu) == 0)
+ icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR;
+ else
+ icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR;
gtk_toolbar_set_icon_size (toolbar, icon_size);
}
if (!drag_item)
{
drag_item = gtk_tool_button_new (NULL, "A quite long button");
- gtk_object_sink (GTK_OBJECT (g_object_ref (drag_item)));
+ g_object_ref_sink (g_object_ref (drag_item));
}
gdk_drag_status (context, GDK_ACTION_MOVE, time);
gint
main (gint argc, gchar **argv)
{
- GtkWidget *window, *toolbar, *table, *treeview, *scrolled_window;
+ GtkWidget *window, *toolbar, *grid, *treeview, *scrolled_window;
GtkWidget *hbox, *hbox1, *hbox2, *checkbox, *option_menu, *menu;
gint i;
static const gchar *toolbar_styles[] = { "icons", "text", "both (vertical)",
g_signal_connect (window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
- table = gtk_table_new (4, 2, FALSE);
- gtk_container_add (GTK_CONTAINER (window), table);
+ grid = gtk_grid_new ();
+ gtk_container_add (GTK_CONTAINER (window), grid);
toolbar = gtk_toolbar_new ();
- gtk_table_attach (GTK_TABLE (table), toolbar,
- 0,2, 0,1, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_widget_set_vexpand (toolbar, TRUE);
+ gtk_grid_attach (GTK_GRID (grid), toolbar, 0, 0, 2, 1);
- hbox1 = gtk_hbox_new (FALSE, 3);
+ hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_container_set_border_width (GTK_CONTAINER (hbox1), 5);
- gtk_table_attach (GTK_TABLE (table), hbox1,
- 1,2, 1,2, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_widget_set_vexpand (hbox1, TRUE);
+ gtk_grid_attach (GTK_GRID (grid), hbox1, 1, 1, 1, 1);
- hbox2 = gtk_hbox_new (FALSE, 2);
+ hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
gtk_container_set_border_width (GTK_CONTAINER (hbox2), 5);
- gtk_table_attach (GTK_TABLE (table), hbox2,
- 1,2, 2,3, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_widget_set_vexpand (hbox2, TRUE);
+ gtk_grid_attach (GTK_GRID (grid), hbox2, 1, 2, 1, 1);
checkbox = gtk_check_button_new_with_mnemonic("_Vertical");
gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE, 0);
checkbox = gtk_check_button_new_with_mnemonic("_Set Toolbar Style:");
g_signal_connect (checkbox, "toggled", G_CALLBACK (set_toolbar_style_toggled), toolbar);
gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE, 0);
-
- option_menu = gtk_option_menu_new();
+
+ option_menu = gtk_combo_box_text_new ();
gtk_widget_set_sensitive (option_menu, FALSE);
g_object_set_data (G_OBJECT (checkbox), "option-menu", option_menu);
- menu = gtk_menu_new();
for (i = 0; i < G_N_ELEMENTS (toolbar_styles); i++)
- {
- GtkWidget *menuitem;
-
- menuitem = gtk_menu_item_new_with_label (toolbar_styles[i]);
- gtk_container_add (GTK_CONTAINER (menu), menuitem);
- gtk_widget_show (menuitem);
- }
- gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
- gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu),
- GTK_TOOLBAR (toolbar)->style);
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), toolbar_styles[i]);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (option_menu),
+ gtk_toolbar_get_style (GTK_TOOLBAR (toolbar)));
gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE, FALSE, 0);
g_signal_connect (option_menu, "changed",
G_CALLBACK (change_toolbar_style), toolbar);
g_signal_connect (checkbox, "toggled", G_CALLBACK (set_icon_size_toggled), toolbar);
gtk_box_pack_start (GTK_BOX (hbox2), checkbox, FALSE, FALSE, 0);
- option_menu = gtk_option_menu_new();
+ option_menu = gtk_combo_box_text_new ();
g_object_set_data (G_OBJECT (checkbox), "option-menu", option_menu);
gtk_widget_set_sensitive (option_menu, FALSE);
- menu = gtk_menu_new();
- menuitem = gtk_menu_item_new_with_label ("small toolbar");
- g_object_set_data (G_OBJECT (menuitem), "value-id", GINT_TO_POINTER (GTK_ICON_SIZE_SMALL_TOOLBAR));
- gtk_container_add (GTK_CONTAINER (menu), menuitem);
- gtk_widget_show (menuitem);
-
- menuitem = gtk_menu_item_new_with_label ("large toolbar");
- g_object_set_data (G_OBJECT (menuitem), "value-id", GINT_TO_POINTER (GTK_ICON_SIZE_LARGE_TOOLBAR));
- gtk_container_add (GTK_CONTAINER (menu), menuitem);
- gtk_widget_show (menuitem);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), "small toolbar");
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), "large toolbar");
+
gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE, FALSE, 0);
g_signal_connect (option_menu, "changed",
G_CALLBACK (icon_size_history_changed), toolbar);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_table_attach (GTK_TABLE (table), scrolled_window,
- 1,2, 3,4, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
+ gtk_widget_set_hexpand (scrolled_window, TRUE);
+ gtk_widget_set_vexpand (scrolled_window, TRUE);
+ gtk_grid_attach (GTK_GRID (grid), scrolled_window, 1, 3, 1, 1);
store = create_items_list (&treeview);
gtk_container_add (GTK_CONTAINER (scrolled_window), treeview);
add_item_to_list (store, item, "-----");
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
- item = gtk_tool_button_new_from_stock (GTK_STOCK_REFRESH);
- add_item_to_list (store, item, "Refresh");
- g_signal_connect (item, "clicked", G_CALLBACK (reload_clicked), NULL);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
item = gtk_tool_item_new ();
gtk_widget_show (image);
add_item_to_list (store, item, "Video");
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
- image = gtk_image_new_from_icon_name ("utility-terminal", GTK_ICON_SIZE_LARGE_TOOLBAR);
+ image = gtk_image_new_from_icon_name ("utilities-terminal", GTK_ICON_SIZE_LARGE_TOOLBAR);
item = gtk_tool_button_new (image, "Terminal");
add_item_to_list (store, item, "Terminal");
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
- hbox = gtk_hbox_new (FALSE, 5);
+ image = gtk_spinner_new ();
+ gtk_spinner_start (GTK_SPINNER (image));
+ item = gtk_tool_button_new (image, "Spinner");
+ add_item_to_list (store, item, "Spinner");
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- gtk_table_attach (GTK_TABLE (table), hbox,
- 1,2, 4,5, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_widget_set_hexpand (hbox, TRUE);
+ gtk_grid_attach (GTK_GRID (grid), hbox, 1, 4, 1, 1);
button = gtk_button_new_with_label ("Drag me to the toolbar");
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
projects / ~andy / gtk / blobdiff