update all

2 files changed, 81 insertions, 67 deletions

diff --git a/litosappwin.c b/litosappwin.c
index b5e0e5f..63f5ec6 100644
--- a/litosappwin.c
+++ b/litosappwin.c
@@ -49,13 +49,14 @@ struct _LitosAppWindow
 	GSettings *settings;
 	GtkNotebook *notebook;
 	GtkWidget *gears;
-	GtkWidget *search;
+	GtkWidget *btn_find_icon;
 	GtkWidget *searchbar;
 	GtkWidget *search_entry;
+	GtkWidget *replace_search_entry;
 	GtkWidget *about;
 	GtkWidget *prev_button;
 	GtkWidget *next_button;
-	GtkWidget *button_check_case;
+	GtkWidget *btn_check_case;
 	GtkSourceSearchContext *search_context;
 	GPtrArray *litosFileList;
 	gboolean quit;
@@ -190,7 +191,7 @@ litos_app_window_set_search_context(LitosAppWindow *win, const char *stringToSea
 
 	GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(source_view));
 
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->button_check_case)))
+	if (gtk_check_button_get_active(GTK_CHECK_BUTTON(win->btn_check_case)))
 		gtk_source_search_settings_set_case_sensitive (settings, TRUE);
 
 	else
@@ -278,7 +279,7 @@ void set_search_entry(LitosAppWindow *win)
 
 void ctrl_f(LitosAppWindow *win)
 {
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(LITOS_APP_WINDOW(win)->search), TRUE);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(LITOS_APP_WINDOW(win)->btn_find_icon), TRUE);
 	gtk_widget_grab_focus(LITOS_APP_WINDOW(win)->search_entry);
 }
 
@@ -508,7 +509,7 @@ litos_app_window_init (LitosAppWindow *win)
 	g_object_unref (builder);
 
 	win->settings = g_settings_new ("org.gtk.litos");
-	gtk_widget_set_sensitive (win->search, TRUE);
+	gtk_widget_set_sensitive (win->btn_find_icon, TRUE);
 
 	win->quit = FALSE;
 	win->search_context = NULL;
@@ -519,12 +520,12 @@ litos_app_window_init (LitosAppWindow *win)
 	g_signal_connect (GTK_WINDOW(win), "close-request", G_CALLBACK (litos_app_window_quit), win);
 	g_signal_connect (win->prev_button, "clicked", G_CALLBACK(prev_match), win);
 	g_signal_connect (win->next_button, "clicked", G_CALLBACK(next_match), win);
-	g_signal_connect (win->search, "clicked", G_CALLBACK(search_btn_clicked), win);
+	g_signal_connect (win->btn_find_icon, "clicked", G_CALLBACK(search_btn_clicked), win);
 
 	/* allow search entry to be automatically focused */
  	gtk_widget_set_can_focus(win->search_entry, TRUE);
 
-	g_object_bind_property (win->search, "active",
+	g_object_bind_property (win->btn_find_icon, "active",
 		win->searchbar, "search-mode-enabled",
 		G_BINDING_BIDIRECTIONAL);
 }
@@ -564,16 +565,16 @@ litos_app_window_class_init (LitosAppWindowClass *class)
 	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
 						"/org/gtk/litos/window.ui");
 
-	BIND_CHILD (notebook);
+	BIND_CHILD (notebook)
 	BIND_CHILD (gears)
-	BIND_CHILD (search)
+	BIND_CHILD (btn_find_icon)
 	BIND_CHILD (searchbar)
 	BIND_CHILD (search_entry)
+	BIND_CHILD (replace_search_entry)
 	BIND_CHILD (about)
-	BIND_CHILD (search)
 	BIND_CHILD (prev_button)
 	BIND_CHILD (next_button)
-	BIND_CHILD (button_check_case)
+	BIND_CHILD (btn_check_case)
 
 	gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), about_dialog);
 	gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), search_text_changed);
diff --git a/window.ui b/window.ui
index 80edb8b..b9767ac 100644
--- a/window.ui
+++ b/window.ui
@@ -1,59 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="LitosAppWindow" parent="GtkApplicationWindow">
-    <property name="title">Litos</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="header">
-        <child type="end">
-          <object class="GtkToggleButton" id="search">
-            <property name="sensitive">0</property>
-            <property name="icon-name">edit-find-symbolic</property>
-          </object>
-        </child>
-	<child type="end">
-          <object class="GtkButton" id="about">
-            <property name="icon-name">logo-icon-about</property>
-            <signal name="clicked" handler="about_dialog"/>
-          </object>
-        </child>
-        <child type="start">
-          <object class="GtkMenuButton" id="gears">
-            <property name="direction">none</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox" id="content_box">
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkSearchBar" id="searchbar">
-	  <child>
-            <object class="GtkBox" id="search_box">
-            <child>
-              <object class="GtkSearchEntry" id="search_entry">
-                <signal name="search-changed" handler="search_text_changed"/>
-              </object>
-            </child>
-	    <child>
-	      <object class="GtkButton" id="prev_button">
-	        <property name="icon-name">go-up</property>
-	      </object>
-	    </child>
-	    <child>
-	      <object class="GtkButton" id="next_button">
-	        <property name="icon-name">go-down</property>
-	      </object>
-	   </child>
-         </object>
-        </child>
-	</object>
-	</child>
-        <child>
-	<object class="GtkNotebook" id="notebook">
-	</object>
-        </child>
-      </object>
-    </child>
-  </template>
+	<template class="LitosAppWindow" parent="GtkApplicationWindow">
+		<property name="title">Litos</property>
+		<child type="titlebar">
+			<object class="GtkHeaderBar" id="header">
+				<child type="end">
+					<object class="GtkToggleButton" id="btn_find_icon">
+						<property name="sensitive">0</property>
+						<property name="icon-name">edit-find-symbolic</property>
+					</object>
+				</child>
+				<child type="end">
+					<object class="GtkButton" id="about">
+						<property name="icon-name">logo-icon-about</property>
+						<signal name="clicked" handler="about_dialog"/>
+					</object>
+				</child>
+				<child type="start">
+					<object class="GtkMenuButton" id="gears">
+						<property name="direction">none</property>
+					</object>
+				</child>
+			</object>
+		</child>
+		<child>
+			<object class="GtkBox" id="content_box">
+				<property name="orientation">vertical</property>
+				<child>
+					<object class="GtkSearchBar" id="searchbar">
+						<child>
+							<object class="GtkBox" id="replace_box">
+								<property name="orientation">vertical</property>
+								<child>
+							<object class="GtkBox" id="search_box">
+								<property name="orientation">horizontal</property>
+								<child>
+									<object class="GtkSearchEntry" id="search_entry">
+										<signal name="search-changed" handler="search_text_changed"/>
+									</object>
+								</child>
+								<child type="end">
+									<object class="GtkCheckButton" id="btn_check_case">
+										<property name="label">Match case</property>
+									</object>
+								</child>
+								<child>
+									<object class="GtkButton" id="prev_button">
+										<property name="icon-name">go-up</property>
+									</object>
+								</child>
+								<child>
+									<object class="GtkButton" id="next_button">
+										<property name="icon-name">go-down</property>
+									</object>
+								</child>
+							</object>
+						</child>
+								<child>
+									<object class="GtkText" id="replace_search_entry"></object>
+								</child>
+							</object>
+						</child>
+					</object>
+				</child>
+				<child>
+					<object class="GtkNotebook" id="notebook"></object>
+				</child>
+			</object>
+		</child>
+	</template>
 </interface>