Merge lp:~fabiozaramella/scratch/fix-1337291 into lp:~elementary-apps/scratch/scratch

[Fabio Zaramella]

* Replace deprecated Granite.LightWindow with Gtk.Dialog in TemplateManager
* Replace deprecated Granite.SearchBar with Gtk.SearchEntry in SearchManager

[Cody Garver (codygarver)]

Doesn't window.title = label; need to be window.title = _(label); so that the translation carries?

review: Needs Information

[Fabio Zaramella (fabiozaramella)]

Sincerely i don't know, but if it has to be translated also the row:

var button = new TemplateButton (label, description, icon_id);

should be:

var button = new TemplateButton (_(label), description, icon_id);

no?

[Robert Roth (evfool)]

I guess you've had a conflict, fix the merge comments.

review: Needs Fixing (code review)

[lp:~fabiozaramella/scratch/fix-1337291]

1357. By ffabio-96-x on 2014-10-03

solve conflicts

[Fabio Zaramella (fabiozaramella)]

no it's not ok now

[Robert Roth (evfool)]

The "<<<<<<< TREE", ">>>>>>> MERGE-SOURCE" and "=======" conflict markers are still there, the replace_entry is declared and set up twice, once with text, next time with icon only, this can't be ok.

review: Needs Fixing

[lp:~fabiozaramella/scratch/fix-1337291]

1358. By ffabio-96-x on 2014-10-03

now should be ok

[Fabio Zaramella (fabiozaramella)]

yeah i've noticed that :p

[Fabio Zaramella (fabiozaramella)]

removed

[Robert Roth (evfool)]

Ok, thanks, code-wise it looks ok now, the diff does look like doing exactly what the comments say it does.
Regarding the label string needing translation: I think the label should come as a translated string from the register_template invocation (not used at all right now), along with the description string, so I am approving this.

review: Approve

=== modified file 'src/Services/TemplateManager.vala'
--- src/Services/TemplateManager.vala	2013-07-23 20:22:38 +0000
+++ src/Services/TemplateManager.vala	2014-10-03 19:54:38 +0000
@@ -209,7 +209,7 @@
  **/
 public class Scratch.TemplateManager : GLib.Object {
     
-    private Granite.Widgets.LightWindow dialog;
+    private Gtk.Dialog dialog;
     
     private Scratch.Template current_template;
     
@@ -227,7 +227,8 @@
     public signal void template_loaded (Template template, File file);
     
     public TemplateManager () {
-        dialog = new Granite.Widgets.LightWindow (_("Templates"));
+        dialog = new Gtk.Dialog ();
+        dialog.title = _("Templates");
         
         this.grid = new Gtk.Grid ();
         this.grid.margin = 5;
@@ -267,7 +268,8 @@
         button.clicked.connect (() => {
             current_template = (Scratch.Template) Object.new (template_type);
             this.dialog.hide ();
-            var window = new Granite.Widgets.LightWindow (label);
+            var window = new Gtk.Dialog ();
+            window.title = label;
             if (parent != null) window.set_transient_for ((Gtk.Window)parent);
             window.add (current_template.get_creation_box ());
             window.show_all ();
@@ -305,4 +307,4 @@
             dialog.show_all ();
         }
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/SearchManager.vala'
--- src/Widgets/SearchManager.vala	2014-08-31 19:20:46 +0000
+++ src/Widgets/SearchManager.vala	2014-10-03 19:54:38 +0000
@@ -32,8 +32,8 @@
         private Gtk.ToolItem tool_arrow_up;
         private Gtk.ToolItem tool_arrow_down;
 
-        public Granite.Widgets.SearchBar search_entry;
-        public Granite.Widgets.SearchBar replace_entry;
+        public Gtk.SearchEntry search_entry;
+        public Gtk.SearchEntry replace_entry;
         public Gtk.SpinButton go_to_entry;
         private Gtk.Adjustment go_to_adj;
         
@@ -68,7 +68,8 @@
             // Main entries
             // Search entry
             this.window = window;
-            search_entry = new Granite.Widgets.SearchBar (_("Find"));
+            search_entry = new Gtk.SearchEntry ();
+            search_entry.placeholder_text = _("Find");
             search_entry.width_request = 250;
             
             // Back and Next buttons
@@ -87,7 +88,8 @@
             previous.image = i;
             
             // Replace entry
-            replace_entry = new Granite.Widgets.SearchBar (_("Replace With"));
+            replace_entry = new Gtk.SearchEntry ();
+            replace_entry.placeholder_text = _("Replace With");
             replace_entry.set_icon_from_icon_name (Gtk.EntryIconPosition.PRIMARY, "edit-symbolic");
             replace_entry.width_request = 250;