From e10a507c4f590f7c3ca84dd70aabd2250838103f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Pekka=20Geh=C3=B6r?= <pegu6@msn.com>
Date: Fri, 9 Jan 2009 13:07:03 +0200
Subject: [PATCH] Added scrolled window

---
 irreco/src/core/irreco_button_creator_dlg.c | 33 +++++++++++++++++++++++------
 irreco/src/core/irreco_theme_creator_dlg.c  | 17 ++++++++-------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/irreco/src/core/irreco_button_creator_dlg.c b/irreco/src/core/irreco_button_creator_dlg.c
index 8a01665d..fae4baed 100644
--- a/irreco/src/core/irreco_button_creator_dlg.c
+++ b/irreco/src/core/irreco_button_creator_dlg.c
@@ -110,7 +110,7 @@ static void irreco_button_creator_dlg_constructed(GObject *object)
 
 	IrrecoData *irreco_data;
 	IrrecoButtonCreatorDlg *self;
-
+	GtkWidget		*scrolled_table;
 	GtkWidget		*table;
 	GtkWidget		*frame_unpressed;
 	GtkWidget		*frame_pressed;
@@ -125,7 +125,7 @@ static void irreco_button_creator_dlg_constructed(GObject *object)
 	/* Settings */
 	GtkWidget		*table_settings;
 	GtkWidget		*label_allow_text;
-
+	GtkWidget		*scrolled_table_settings;
 	GtkWidget		*label_text_padding;
 	GtkWidget		*label_text_h_align;
 	GtkWidget		*label_text_v_align;
@@ -156,7 +156,7 @@ static void irreco_button_creator_dlg_constructed(GObject *object)
 	self->notebook = gtk_notebook_new();
 
 	/* Create widgets. */
-
+	scrolled_table = gtk_scrolled_window_new(NULL, NULL);
 	table = gtk_table_new(7, 9, TRUE);
 	label_name = gtk_label_new(_("Name:"));
 	label_select_unpressed = gtk_label_new(_("Unpressed:"));
@@ -176,7 +176,7 @@ static void irreco_button_creator_dlg_constructed(GObject *object)
 	self->add_button_pressed = gtk_button_new_with_label(_("Select"));
 
 	/* Create settings widgets*/
-
+	scrolled_table_settings = gtk_scrolled_window_new(NULL, NULL);
 	table_settings = gtk_table_new(7, 9, TRUE);
 	label_allow_text = gtk_label_new(_("AllowText:"));
 	self->label_text_format_up = gtk_label_new(_("TextFormatUp:"));
@@ -225,14 +225,33 @@ static void irreco_button_creator_dlg_constructed(GObject *object)
 	gtk_misc_set_alignment(GTK_MISC(label_text_v_align), 0, 0.5);
 	gtk_misc_set_alignment(GTK_MISC(label_size), 0, 0.5);
 
+	/* Set table on the scrolled */
+	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(
+					      scrolled_table),
+	   				      GTK_WIDGET(table));
+
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_table),
+				       GTK_POLICY_NEVER,
+	   			       GTK_POLICY_AUTOMATIC);
+
+	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(
+					      scrolled_table_settings),
+	   				      GTK_WIDGET(table_settings));
+
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(
+				       scrolled_table_settings),
+				       GTK_POLICY_NEVER,
+	   			       GTK_POLICY_AUTOMATIC);
+
 	/* Create Notebook tabs. */
 
 	gtk_notebook_append_page(GTK_NOTEBOOK(self->notebook),
-				 irreco_gtk_align(GTK_WIDGET(table),
+				 irreco_gtk_align(GTK_WIDGET(scrolled_table),
 				 0, 0, 1, 1, 8, 8, 8, 8),
      				 gtk_label_new("BUTTONS"));
 	gtk_notebook_append_page(GTK_NOTEBOOK(self->notebook),
-				 irreco_gtk_align(GTK_WIDGET(table_settings),
+				 irreco_gtk_align(GTK_WIDGET(
+				 scrolled_table_settings),
 				 0, 0, 1, 1, 8, 8, 8, 8),
      				 gtk_label_new("SETTINGS"));
 
@@ -354,6 +373,8 @@ static void irreco_button_creator_dlg_constructed(GObject *object)
 			 G_CALLBACK(_unbutton_size_changed), self);
 	g_signal_connect(G_OBJECT(self->button_size), "value-changed",
 			 G_CALLBACK(_button_size_changed), self);
+
+	gtk_widget_set_size_request(GTK_WIDGET(self), 696, 396);
 	gtk_widget_show_all(GTK_WIDGET(self));
 
 	IRRECO_RETURN
diff --git a/irreco/src/core/irreco_theme_creator_dlg.c b/irreco/src/core/irreco_theme_creator_dlg.c
index f8ae906e..28fad9e5 100644
--- a/irreco/src/core/irreco_theme_creator_dlg.c
+++ b/irreco/src/core/irreco_theme_creator_dlg.c
@@ -197,10 +197,15 @@ static void irreco_theme_creator_dlg_constructed(GObject *object)
 				   "Preview button", 0, 0, 0, 0, 0, 0));
 
 	/* Set table on the scrolled */
-	gtk_container_add(GTK_CONTAINER(scrolled_table),
-			  table_about);
+	/*gtk_container_add(GTK_CONTAINER(scrolled_table),
+			  table_about);*/
+
+	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(
+					      scrolled_table),
+	   				      GTK_WIDGET(table_about));
+
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_table),
-				       GTK_POLICY_AUTOMATIC,
+				       GTK_POLICY_NEVER,
 	   			       GTK_POLICY_AUTOMATIC);
 
 	/* Create Notebook tabs. */
@@ -242,7 +247,6 @@ static void irreco_theme_creator_dlg_constructed(GObject *object)
 	gtk_table_attach_defaults(GTK_TABLE(table_about),
 				  preview_button_frame, 6, 9, 2, 7);
 
-
 	/*ABOUT*/
 	/* set preview image*/
 
@@ -286,10 +290,7 @@ static void irreco_theme_creator_dlg_constructed(GObject *object)
 			 G_CALLBACK(irreco_theme_creator_dlg_delete_bg_button),
 			 self);
 
-
-	gtk_widget_set_size_request(GTK_WIDGET(table_about), 696, 396);
-
-
+	gtk_widget_set_size_request(GTK_WIDGET(self), 696, 396);
 	gtk_widget_show_all(GTK_WIDGET(self));
 	IRRECO_RETURN
 }
-- 
2.11.4.GIT